@codiac.io/codiac-cli 1.3.166 → 1.3.169
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/README.md +1 -1
- package/dist/apis/codiac-api/gen/contracts/types.gen.d.ts +6 -2
- package/dist/apis/codiac-api/gen/contracts/types.gen.js +3 -0
- package/dist/apis/codiac-api/gen/contracts/types.gen.js.map +1 -1
- package/dist/apis/codiac-api-nats/gen/contracts/types.gen.d.ts +7 -3
- package/dist/apis/codiac-api-nats/gen/contracts/types.gen.js +4 -1
- package/dist/apis/codiac-api-nats/gen/contracts/types.gen.js.map +1 -1
- package/dist/apis/codiac-relay/gen/client.d.ts +5 -3
- package/dist/apis/codiac-relay/gen/client.js +6 -0
- package/dist/apis/codiac-relay/gen/client.js.map +1 -1
- package/dist/apis/codiac-relay/gen/contracts/types.gen.d.ts +37 -4
- package/dist/apis/codiac-relay/gen/contracts/types.gen.js +6 -0
- package/dist/apis/codiac-relay/gen/contracts/types.gen.js.map +1 -1
- package/dist/apis/codiac-relay/i-client.d.ts +1 -1
- package/dist/apis/codiac-relay-nats/gen/client.d.ts +3 -1
- package/dist/apis/codiac-relay-nats/gen/client.js +7 -0
- package/dist/apis/codiac-relay-nats/gen/client.js.map +1 -1
- package/dist/apis/codiac-relay-nats/gen/contracts/types.gen.d.ts +39 -3
- package/dist/apis/codiac-relay-nats/gen/contracts/types.gen.js +6 -0
- package/dist/apis/codiac-relay-nats/gen/contracts/types.gen.js.map +1 -1
- package/dist/apis/codiac-relay-nats/gen/contracts.ng.d.ts +3 -0
- package/dist/apis/codiac-relay-nats/gen/contracts.ng.js.map +1 -1
- package/dist/codiac-constants.d.ts +4 -0
- package/dist/codiac-constants.js +4 -0
- package/dist/codiac-constants.js.map +1 -1
- package/dist/codiac-entities/cluster-capture-def.d.ts +1 -1
- package/dist/codiac-utils.d.ts +5 -0
- package/dist/codiac-utils.js +14 -0
- package/dist/codiac-utils.js.map +1 -0
- package/dist/command-base-enterprise.d.ts +14 -0
- package/dist/command-base-enterprise.js +49 -0
- package/dist/command-base-enterprise.js.map +1 -1
- package/dist/command-base-exec.js +2 -0
- package/dist/command-base-exec.js.map +1 -1
- package/dist/commands/asset/deploy.d.ts +2 -0
- package/dist/commands/asset/deploy.js +21 -4
- package/dist/commands/asset/deploy.js.map +1 -1
- package/dist/commands/asset/list.js +4 -3
- package/dist/commands/asset/list.js.map +1 -1
- package/dist/commands/asset/undeploy.d.ts +2 -0
- package/dist/commands/asset/undeploy.js +7 -0
- package/dist/commands/asset/undeploy.js.map +1 -1
- package/dist/commands/asset/view.js +5 -3
- package/dist/commands/asset/view.js.map +1 -1
- package/dist/commands/asset/where.js +12 -2
- package/dist/commands/asset/where.js.map +1 -1
- package/dist/commands/cabinet/contents.d.ts +1 -0
- package/dist/commands/cabinet/contents.js +17 -2
- package/dist/commands/cabinet/contents.js.map +1 -1
- package/dist/commands/cluster/scaling/update.js +3 -2
- package/dist/commands/cluster/scaling/update.js.map +1 -1
- package/dist/commands/cluster/stack/capture.d.ts +24 -0
- package/dist/commands/cluster/stack/capture.js +107 -0
- package/dist/commands/cluster/stack/capture.js.map +1 -0
- package/dist/commands/cluster/start.js +1 -1
- package/dist/commands/cluster/start.js.map +1 -1
- package/dist/commands/cluster/stop.js +1 -1
- package/dist/commands/cluster/stop.js.map +1 -1
- package/dist/commands/config/add.d.ts +2 -0
- package/dist/commands/config/add.js +51 -5
- package/dist/commands/config/add.js.map +1 -1
- package/dist/commands/config/delete.js +3 -1
- package/dist/commands/config/delete.js.map +1 -1
- package/dist/commands/config/deploy.d.ts +4 -0
- package/dist/commands/config/deploy.js +87 -5
- package/dist/commands/config/deploy.js.map +1 -1
- package/dist/commands/config/settings/get.js +3 -1
- package/dist/commands/config/settings/get.js.map +1 -1
- package/dist/commands/config/view.js +3 -1
- package/dist/commands/config/view.js.map +1 -1
- package/dist/commands/kit/create.js +2 -1
- package/dist/commands/kit/create.js.map +1 -1
- package/dist/commands/noc/cluster/capture.js +2 -1
- package/dist/commands/noc/cluster/capture.js.map +1 -1
- package/dist/commands/noc/cluster/create.d.ts +2 -0
- package/dist/commands/noc/cluster/create.js +17 -4
- package/dist/commands/noc/cluster/create.js.map +1 -1
- package/dist/commands/noc/cluster/deinit.js +7 -5
- package/dist/commands/noc/cluster/deinit.js.map +1 -1
- package/dist/commands/noc/cluster/init.js +1 -1
- package/dist/commands/noc/cluster/init.js.map +1 -1
- package/dist/commands/noc/cluster/recreate.js +1 -1
- package/dist/commands/noc/cluster/recreate.js.map +1 -1
- package/dist/commands/snapshot/deploy.d.ts +51 -0
- package/dist/commands/snapshot/deploy.js +305 -0
- package/dist/commands/snapshot/deploy.js.map +1 -0
- package/dist/commands/snapshot/list.d.ts +15 -0
- package/dist/commands/snapshot/list.js +164 -0
- package/dist/commands/snapshot/list.js.map +1 -0
- package/dist/sdk-adapters/azure/azure-resource-configurator.d.ts +2 -1
- package/dist/sdk-adapters/azure/azure-resource-configurator.js +37 -29
- package/dist/sdk-adapters/azure/azure-resource-configurator.js.map +1 -1
- package/dist/uilogic/config-ui-utils.d.ts +3 -1
- package/dist/uilogic/config-ui-utils.js +36 -5
- package/dist/uilogic/config-ui-utils.js.map +1 -1
- package/dist/uilogic/enterprise-contextualizer.js +11 -0
- package/dist/uilogic/enterprise-contextualizer.js.map +1 -1
- package/dist/uilogic/lrp-watcher-predef.d.ts +3 -1
- package/dist/uilogic/lrp-watcher-predef.js +19 -6
- package/dist/uilogic/lrp-watcher-predef.js.map +1 -1
- package/dist/uilogic/lrp-watcher-utils.d.ts +1 -1
- package/dist/uilogic/lrp-watcher.d.ts +2 -0
- package/dist/uilogic/lrp-watcher.js +14 -2
- package/dist/uilogic/lrp-watcher.js.map +1 -1
- package/dist/uilogic/rootmap-ui-utils.d.ts +5 -0
- package/dist/uilogic/rootmap-ui-utils.js +45 -3
- package/dist/uilogic/rootmap-ui-utils.js.map +1 -1
- package/dist/user-context-loader.d.ts +24 -1
- package/dist/user-context-loader.js +86 -16
- package/dist/user-context-loader.js.map +1 -1
- package/oclif.manifest.json +232 -19
- package/package.json +2 -2
|
@@ -5,7 +5,15 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const core_1 = require("@oclif/core");
|
|
6
6
|
const command_base_exec_1 = require("../../command-base-exec");
|
|
7
7
|
const config_ui_utils_1 = require("../../uilogic/config-ui-utils");
|
|
8
|
+
const codiac_utils_1 = require("../../codiac-utils");
|
|
8
9
|
class CabinetContents extends command_base_exec_1.CommandBaseExec {
|
|
10
|
+
constructor() {
|
|
11
|
+
super(...arguments);
|
|
12
|
+
this.infrxAliases = ["cluster:contents"];
|
|
13
|
+
// ===========================================================================================================================
|
|
14
|
+
// ===========================================================================================================================
|
|
15
|
+
// ===========================================================================================================================
|
|
16
|
+
}
|
|
9
17
|
captureArgs() {
|
|
10
18
|
var _a, _b;
|
|
11
19
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -87,7 +95,14 @@ class CabinetContents extends command_base_exec_1.CommandBaseExec {
|
|
|
87
95
|
if (stateResult.success == true && (stateResult.output != undefined)) {
|
|
88
96
|
let state = stateResult.output;
|
|
89
97
|
// Tree Render
|
|
90
|
-
|
|
98
|
+
const isInfrxEnterprise = codiac_utils_1.CodiacUtils.isInfrxEnterprise(candidate.enterprise);
|
|
99
|
+
if (isInfrxEnterprise) {
|
|
100
|
+
const clusterName = candidate.environment; // TODO: This is fragile. Instead, capture the clusterName from the CabinetRoot and append it to the candidate object.
|
|
101
|
+
this._ui.userMessage("Currently installed on ".concat("cluster", " ", this._styler.hilite(clusterName), ":"));
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
this._ui.userMessage("Currently deployed to ".concat("cabinet", " ", candidate.enterprise, "/", candidate.environment, "/", this._styler.hilite(candidate.cabinet), ":"));
|
|
105
|
+
}
|
|
91
106
|
this._ui.userMessage(" ");
|
|
92
107
|
let env = state.environmentsAsArray.find(e => e.code == candidate.environment);
|
|
93
108
|
if (env != undefined) {
|
|
@@ -178,7 +193,7 @@ class CabinetContents extends command_base_exec_1.CommandBaseExec {
|
|
|
178
193
|
}
|
|
179
194
|
exports.CabinetContents = CabinetContents;
|
|
180
195
|
CabinetContents.description = 'Renders the list of asset versions that are currently deployed to the given cabinet.';
|
|
181
|
-
CabinetContents.aliases = ['cab:contents'];
|
|
196
|
+
CabinetContents.aliases = ['cab:contents', 'cluster:contents'];
|
|
182
197
|
CabinetContents.args = {};
|
|
183
198
|
CabinetContents.flags = {
|
|
184
199
|
enterprise: core_1.Flags.string({ char: 'e', required: false, description: 'The name of the enterprise in which to create this asset. (defaults to the current enterprise context)' }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contents.js","sourceRoot":"","sources":["../../../src/commands/cabinet/contents.ts"],"names":[],"mappings":";;;;AAAA,sCAAmD;AAGnD,+DAA0D;AAC1D,mEAAiE;
|
|
1
|
+
{"version":3,"file":"contents.js","sourceRoot":"","sources":["../../../src/commands/cabinet/contents.ts"],"names":[],"mappings":"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"}
|
|
@@ -128,7 +128,7 @@ class ClusterScalingUpdate extends command_base_exec_1.CommandBaseExec {
|
|
|
128
128
|
// }));
|
|
129
129
|
//
|
|
130
130
|
// this.logger.debug("Recieved result", result);
|
|
131
|
-
let result = yield this.watcher.triggerAndWatch((socketId) => {
|
|
131
|
+
let result = yield this.watcher.triggerAndWatch((correlationId, socketId) => {
|
|
132
132
|
var _a, _b, _c, _d;
|
|
133
133
|
return this.genRelayClient.Call.clusterCreateAsync({
|
|
134
134
|
spec: {
|
|
@@ -147,7 +147,8 @@ class ClusterScalingUpdate extends command_base_exec_1.CommandBaseExec {
|
|
|
147
147
|
modifiedBy: this._userCntx.userName,
|
|
148
148
|
identitySpec: { type: contracts_1.SecurityAccountTypeEnum.servicePrincipal, name: "" } // <-- this needs to be nullable!!
|
|
149
149
|
},
|
|
150
|
-
socketId: socketId
|
|
150
|
+
socketId: socketId,
|
|
151
|
+
correlationId: correlationId
|
|
151
152
|
});
|
|
152
153
|
});
|
|
153
154
|
if (result.error)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/cluster/scaling/update.ts"],"names":[],"mappings":";;;AAAA,sCAAyC;AAEzC,kEAAkI;AAClI,kEAA4D;AAC5D,sEAAoE;AACpE,oEAAyE;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/cluster/scaling/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { InteractionModes } from '../../../uilogic/config-ui-utils';
|
|
2
|
+
import { CommandBaseExecTenant } from '../../../command-base-exec-tenant';
|
|
3
|
+
import { ClusterStackCaptureRequest } from '../../../apis/codiac-relay-nats';
|
|
4
|
+
export default class ClusterStackCapture extends CommandBaseExecTenant<ClusterStackCaptureRequest> {
|
|
5
|
+
static description: string;
|
|
6
|
+
static aliases: never[];
|
|
7
|
+
static examples: string[];
|
|
8
|
+
static flags: {
|
|
9
|
+
silent: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
10
|
+
echo: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
11
|
+
"to-script": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
12
|
+
"take-defaults": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
13
|
+
};
|
|
14
|
+
static args: {
|
|
15
|
+
name: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
|
|
16
|
+
};
|
|
17
|
+
protected adminOnly: boolean;
|
|
18
|
+
protected bootstrap(): void;
|
|
19
|
+
captureArgs(): Promise<[Partial<ClusterStackCaptureRequest>, InteractionModes | undefined, boolean]>;
|
|
20
|
+
buildCandidate_silently(partial: Partial<ClusterStackCaptureRequest>): Promise<ClusterStackCaptureRequest | undefined>;
|
|
21
|
+
buildCandidate_interactively(partial: Partial<ClusterStackCaptureRequest>, takeDefaults: boolean): Promise<ClusterStackCaptureRequest | undefined>;
|
|
22
|
+
buildCommandString(candidate: ClusterStackCaptureRequest, cmd: string[]): string[];
|
|
23
|
+
executeTask(candidate: ClusterStackCaptureRequest): Promise<void>;
|
|
24
|
+
}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const core_1 = require("@oclif/core");
|
|
5
|
+
const _ = require("lodash");
|
|
6
|
+
const config_ui_utils_1 = require("../../../uilogic/config-ui-utils");
|
|
7
|
+
const command_base_exec_tenant_1 = require("../../../command-base-exec-tenant");
|
|
8
|
+
const k8s_utils_1 = require("../../../ops/k8s/k8s-utils");
|
|
9
|
+
const codiac_constants_1 = require("../../../codiac-constants");
|
|
10
|
+
const prettify_1 = require("../../../prettify");
|
|
11
|
+
const clusterProjxn = { pathsIncluded: ["id", "name", "provider", "locationName", "instance", "modified", "modifiedBy"], pathsExcluded: [] };
|
|
12
|
+
// -----------------------------------------------------------------
|
|
13
|
+
class ClusterStackCapture extends command_base_exec_tenant_1.CommandBaseExecTenant {
|
|
14
|
+
constructor() {
|
|
15
|
+
super(...arguments);
|
|
16
|
+
this.adminOnly = true;
|
|
17
|
+
}
|
|
18
|
+
bootstrap() {
|
|
19
|
+
super.bootstrap();
|
|
20
|
+
k8s_utils_1.K8sUtils.bootstrap(this.ioc, this);
|
|
21
|
+
}
|
|
22
|
+
captureArgs() {
|
|
23
|
+
var _a, _b, _c;
|
|
24
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
|
+
const { args, flags } = yield this.parse(ClusterStackCapture);
|
|
26
|
+
let partial = {};
|
|
27
|
+
if (args.name)
|
|
28
|
+
partial.name = (_a = args.name) !== null && _a !== void 0 ? _a : codiac_constants_1.CliConstants.CLUSTER_STACK_NAME_DEFAULT;
|
|
29
|
+
;
|
|
30
|
+
// ---------------------------------------------------------------
|
|
31
|
+
// TODO: move everything from here down into the base class
|
|
32
|
+
// ---------------------------------------------------------------
|
|
33
|
+
const interactionMode = (this.pipedInput) ? config_ui_utils_1.InteractionModes.silent : (_c = (_b = undefined !== null && undefined !== void 0 ? undefined : (flags.echo ? config_ui_utils_1.InteractionModes.echo : undefined)) !== null && _b !== void 0 ? _b : (flags["to-script"] ? config_ui_utils_1.InteractionModes.toscript : undefined)) !== null && _c !== void 0 ? _c : (flags.silent ? config_ui_utils_1.InteractionModes.silent : undefined);
|
|
34
|
+
const takeDefaults = flags['take-defaults'];
|
|
35
|
+
return [partial, interactionMode, takeDefaults];
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
// /** Throws on invalid */
|
|
39
|
+
// private validate(partial: Partial<IAuthRoleDef>): void {
|
|
40
|
+
// if (partial.name == undefined || _.isEmpty(partial.name)) throw new Error("Missing name");
|
|
41
|
+
// let rxName = /^[a-zA-Z][a-zA-Z0-9-]{2,50}$/;
|
|
42
|
+
// if (!rxName.test(partial.name)) throw new Error("Invalid name: must be 3- to 50-character string of alphanumerics and hyphens, starting with a letter.");
|
|
43
|
+
// }
|
|
44
|
+
buildCandidate_silently(partial) {
|
|
45
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
46
|
+
let candidate = {
|
|
47
|
+
name: partial.name
|
|
48
|
+
};
|
|
49
|
+
return candidate;
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
buildCandidate_interactively(partial, takeDefaults) {
|
|
53
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
54
|
+
// partial.name = await this._ui.prompt("txtName", "Stack name: ", false, partial.name);
|
|
55
|
+
return yield this.buildCandidate_silently(partial);
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
buildCommandString(candidate, cmd) {
|
|
59
|
+
cmd.push("--silent");
|
|
60
|
+
if (candidate.name)
|
|
61
|
+
cmd.push(candidate.name);
|
|
62
|
+
return cmd;
|
|
63
|
+
}
|
|
64
|
+
executeTask(candidate) {
|
|
65
|
+
var _a, _b, _c;
|
|
66
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
67
|
+
try {
|
|
68
|
+
const result = yield this.genRelayClient.Call.clusterStackCapture(candidate);
|
|
69
|
+
if (result.error)
|
|
70
|
+
throw result.error;
|
|
71
|
+
if (result.output != undefined && !_.isEmpty(result.output)) {
|
|
72
|
+
const userOutput = (0, prettify_1.prettify)(result.output);
|
|
73
|
+
this._ui.userMessage("Successfully captured cluster stack ".concat("[", (_a = candidate.name) !== null && _a !== void 0 ? _a : codiac_constants_1.CliConstants.CLUSTER_STACK_NAME_DEFAULT, "]", result.message ? " " + result.message : ""));
|
|
74
|
+
this._ui.userMessage(userOutput);
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
this._ui.userMessage("Unable to capture cluster stack ".concat("[", (_b = candidate.name) !== null && _b !== void 0 ? _b : codiac_constants_1.CliConstants.CLUSTER_STACK_NAME_DEFAULT, "]: ", (_c = result.message) !== null && _c !== void 0 ? _c : "(check logs for details)"));
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
catch (err) {
|
|
81
|
+
this.handleError(err);
|
|
82
|
+
}
|
|
83
|
+
finally {
|
|
84
|
+
yield this.closeConnections();
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
exports.default = ClusterStackCapture;
|
|
91
|
+
ClusterStackCapture.description = 'Fetches, creates, and configures each component of the built-in cluster stack. This command only has to be run once for any given cluster stack. NOTE: running this command will load the given cluster stack into your infrx enterprise and overwrite any existing assets that match by name and any matching settings at the enterprise level. This command does not delete any existing settings. NOTE: This command DOES NOT directly modify any clusters. It only loads asset and config records into Codiac for the infrx enterprise.';
|
|
92
|
+
ClusterStackCapture.aliases = [];
|
|
93
|
+
ClusterStackCapture.examples = [
|
|
94
|
+
'<%= config.bin %> <%= command.id %> my-fav-cluster'
|
|
95
|
+
];
|
|
96
|
+
ClusterStackCapture.flags = {
|
|
97
|
+
// "force-refresh": Flags.boolean({ char: 'f', description: 'Prevents a cache hit for the cluster connection and forces a new fetch from the remote cluster itself.' }),
|
|
98
|
+
// TODO: Move these into the base class
|
|
99
|
+
silent: core_1.Flags.boolean({ exclusive: ["echo", "to-script"], description: 'Non-Interactive mode; executes without any user interaction and fails on any missing or invalid arguments.' }),
|
|
100
|
+
echo: core_1.Flags.boolean({ exclusive: ["to-script", "silent"], description: 'Echo interaction mode; renders the equivalent non-interactive cli command for future use before final execution.' }),
|
|
101
|
+
"to-script": core_1.Flags.boolean({ exclusive: ["echo", "silent"], description: 'Toscript interaction mode; renders the equivalent non-interactive cli command WITHOUT any execution.' }),
|
|
102
|
+
"take-defaults": core_1.Flags.boolean({ exclusive: ["silent"], description: "Setting this to true prevents prompting for confirmation on parameters that were passed in or were automatically set to default values (Irrelevant in --silent mode). This behavior does NOT apply to scenarios that the command needs to override invalid user input; such cases will always prompt for confirmation. eg: when no argument was provided for file or type, and only one exists, the system will render the autoselected file unless this flag is set." })
|
|
103
|
+
};
|
|
104
|
+
ClusterStackCapture.args = {
|
|
105
|
+
name: core_1.Args.string({ required: false, description: '(optional, defaults to the Codiac builtin stack) Name of the cluster stack. Versions are selected later at tagging time and cluster install time.' }),
|
|
106
|
+
};
|
|
107
|
+
//# sourceMappingURL=capture.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../../../src/commands/cluster/stack/capture.ts"],"names":[],"mappings":"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"}
|
|
@@ -120,7 +120,7 @@ class ClusterStart extends command_base_exec_tenant_1.CommandBaseExecTenant {
|
|
|
120
120
|
yield this.msgClient.connect();
|
|
121
121
|
this.localCommandRunner.listen(); // to fire off any local machine terminal commands requested by the relay during the cluster create
|
|
122
122
|
}
|
|
123
|
-
let result = yield this.watcher.triggerAndWatch((socketId) => this.genRelayClient.Call.startCluster({ cluster: candidate.cluster, socketId: socketId }));
|
|
123
|
+
let result = yield this.watcher.triggerAndWatch((correlationId, socketId) => this.genRelayClient.Call.startCluster({ cluster: candidate.cluster, socketId: socketId, correlationId: correlationId }));
|
|
124
124
|
if (result.error) {
|
|
125
125
|
this.logger.error(`Error starting cluster: ${result.message || ""}; ${result.error.message}`, result.error);
|
|
126
126
|
this._ui.userMessage(`Error starting cluster: ${result.message || ""}; ${result.error.message}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/cluster/start.ts"],"names":[],"mappings":";;;AAAA,sCAAyC;AACzC,4BAA6B;AAC7B,mEAAiE;AACjE,6EAAuE;AACvE,+DAAyF;AAGzF,uEAAkE;AAClE,6DAAyD;AACzD,iGAA4F;AAO5F,MAAM,aAAa,GAAe,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;AAMzJ,MAAqB,YAAa,SAAQ,gDAAgD;IAA1F;;QAqBY,cAAS,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/cluster/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -119,7 +119,7 @@ class ClusterStop extends command_base_exec_tenant_1.CommandBaseExecTenant {
|
|
|
119
119
|
try {
|
|
120
120
|
let socketId = yield this.msgClient.connect();
|
|
121
121
|
this.localCommandRunner.listen(); // to fire off any local machine terminal commands requested by the relay during the command
|
|
122
|
-
let result = yield this.watcher.triggerAndWatch((socketId) => this.genRelayClient.Call.stopCluster({ cluster: candidate.cluster, socketId: socketId }));
|
|
122
|
+
let result = yield this.watcher.triggerAndWatch((correlationId, socketId) => this.genRelayClient.Call.stopCluster({ cluster: candidate.cluster, socketId: socketId, correlationId: correlationId }));
|
|
123
123
|
if (result.error) {
|
|
124
124
|
this.logger.error(`Error stopping cluster: ${result.message || ""}; ${result.error.message}`, result.error);
|
|
125
125
|
this._ui.userMessage(`Error stopping cluster: ${result.message || ""}; ${result.error.message}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../src/commands/cluster/stop.ts"],"names":[],"mappings":";;;AAAA,sCAAyC;AACzC,4BAA6B;AAC7B,mEAAiE;AACjE,6EAAuE;AAIvE,uEAAkE;AAClE,iGAA4F;AAC5F,6DAAyD;
|
|
1
|
+
{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../src/commands/cluster/stop.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,6 +46,7 @@ export default class ConfigAdd extends CommandBaseEnterprise {
|
|
|
46
46
|
setting: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
47
47
|
"entire-file": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
48
48
|
value: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
49
|
+
condition: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
49
50
|
"value-stdin": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
50
51
|
silent: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
51
52
|
echo: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
@@ -68,6 +69,7 @@ export default class ConfigAdd extends CommandBaseEnterprise {
|
|
|
68
69
|
}[];
|
|
69
70
|
private buildCandidate_silently;
|
|
70
71
|
private buildCandidate_interactively;
|
|
72
|
+
private promptForCondition;
|
|
71
73
|
/** Fails silently; Logs any exceptions and returns undefined. */
|
|
72
74
|
private getConfigSchema;
|
|
73
75
|
/** Converts the given json schema into a dictionary keyed by dotpath-ed property names with the property schema as the value.
|
|
@@ -15,6 +15,7 @@ const config_ui_utils_1 = require("../../uilogic/config-ui-utils");
|
|
|
15
15
|
const codiac_domain_1 = require("@codiac.io/codiac-domain");
|
|
16
16
|
const utils_1 = require("@codiac.io/codiac-domain/utils");
|
|
17
17
|
const type_safety_utils_1 = require("../../uilogic/type-safety-utils");
|
|
18
|
+
const codiac_utils_1 = require("../../codiac-utils");
|
|
18
19
|
// const { selectFiles, COMPLETED, CANCELLED } = require('select-files-cli'); // gd js wo ts...
|
|
19
20
|
// const { selectFiles, COMPLETED, CANCELLED } = require('../../uilogic/file-selector'); // gd js wo ts...
|
|
20
21
|
/** The value provided as input that indicates
|
|
@@ -181,6 +182,9 @@ class ConfigAdd extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
181
182
|
partial.settings = ((_g = partial.settings) !== null && _g !== void 0 ? _g : []).concat(inputDoc);
|
|
182
183
|
}
|
|
183
184
|
// partial.description = flags.description;
|
|
185
|
+
if (flags.condition) {
|
|
186
|
+
partial.condition = flags.condition;
|
|
187
|
+
}
|
|
184
188
|
// TODO: move this into the base class
|
|
185
189
|
const interactionMode = (this.pipedInput) ? config_ui_utils_1.InteractionModes.silent : (_j = (_h = undefined !== null && undefined !== void 0 ? undefined : (flags.echo ? config_ui_utils_1.InteractionModes.echo : undefined)) !== null && _h !== void 0 ? _h : (flags["to-script"] ? config_ui_utils_1.InteractionModes.toscript : undefined)) !== null && _j !== void 0 ? _j : (flags.silent ? config_ui_utils_1.InteractionModes.silent : undefined);
|
|
186
190
|
const takeDefaults = flags['take-defaults'];
|
|
@@ -249,7 +253,7 @@ class ConfigAdd extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
249
253
|
let output = Object.assign({ enterprise: partial.enterprise, asset: partial.asset, scope: (_a = partial.scope) !== null && _a !== void 0 ? _a : contracts_1.ScopeLevel.enterprise, target: partial.target, thisMachine: partial.thisMachine, targetFile: (partial.targetFile) ? partial.targetFile : `[${partial.configType}]`, settings: partial.settings,
|
|
250
254
|
// setting: partial.setting,
|
|
251
255
|
// value: partial.value,
|
|
252
|
-
description: partial.description }, this.createAuditable());
|
|
256
|
+
description: partial.description, condition: partial.condition }, this.createAuditable());
|
|
253
257
|
return output;
|
|
254
258
|
}
|
|
255
259
|
catch (err) {
|
|
@@ -257,7 +261,7 @@ class ConfigAdd extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
257
261
|
}
|
|
258
262
|
}
|
|
259
263
|
buildCandidate_interactively(partial, rootMap, takeDefaults = false) {
|
|
260
|
-
var _a, _b, _c;
|
|
264
|
+
var _a, _b, _c, _d;
|
|
261
265
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
262
266
|
let output;
|
|
263
267
|
try {
|
|
@@ -279,7 +283,8 @@ class ConfigAdd extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
279
283
|
const setEntireFile = Boolean((_a = partial.settings) === null || _a === void 0 ? void 0 : _a.find(s => s.setting == utils_1.ConfigDefUtils.CONFIG_SETTING_NAME_ENTIRE_FILE));
|
|
280
284
|
let typeFileChanged;
|
|
281
285
|
// let existingSettings: ScopedSetting[] | undefined;
|
|
282
|
-
|
|
286
|
+
const isInfrxEnterprise = codiac_utils_1.CodiacUtils.isInfrxEnterprise(enterprise.name);
|
|
287
|
+
[partial.configType, partialConfigDef.targetFile, partialConfigDef.settings, typeFileChanged] = yield this.configUtils.promptForTypeAndFile(partial.enterprise, partialConfigDef.asset, assetType, partial.configType, partial.targetFile, undefined, true, takeDefaults, setEntireFile, isInfrxEnterprise); // TakeDefaults will never apply bc we're allowing addNew (are these always mutally exclusive?)
|
|
283
288
|
let configType = (_b = (partial.configType ? type_safety_utils_1.TypeSafetyUtils.toEnum(contracts_1.ConfigDefTypesEnum, partial.configType) : undefined)) !== null && _b !== void 0 ? _b : contracts_1.ConfigDefTypesEnum.file;
|
|
284
289
|
// 3. Setting
|
|
285
290
|
let settingName;
|
|
@@ -313,13 +318,16 @@ class ConfigAdd extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
313
318
|
// 5. Value
|
|
314
319
|
value = yield this.promptForValueAndValidate(partial.configType, { setting: settingName, value: value, scope: partial.scope, target: partial.target, thisMachine: partial.thisMachine, enterprise: partial.enterprise }, instances, rootMap, settingSchema);
|
|
315
320
|
partial.settings = [{ setting: settingName, value: value }];
|
|
316
|
-
// 6.
|
|
321
|
+
// 6. Condition
|
|
322
|
+
let existing = instances === null || instances === void 0 ? void 0 : instances.find(s => s.scope === partial.scope && s.target === partial.target);
|
|
323
|
+
partial.condition = yield this.promptForCondition((_d = partial.condition) !== null && _d !== void 0 ? _d : existing === null || existing === void 0 ? void 0 : existing.condition);
|
|
324
|
+
// 7. Confirm or loop back around to enterprise
|
|
317
325
|
confirmed = yield this._ui.promptConfirm("confirm", "Apply? ");
|
|
318
326
|
} while (!confirmed);
|
|
319
327
|
output = Object.assign({
|
|
320
328
|
// setting: partial.setting,
|
|
321
329
|
// value: partial.value,
|
|
322
|
-
settings: partial.settings, targetFile: partialConfigDef.targetFile, configType: partial.configType, asset: partialConfigDef.asset, enterprise: partialConfigDef.enterprise, scope: partial.scope, target: partial.target, thisMachine: partial.thisMachine, description: partial.description }, this.createAuditable());
|
|
330
|
+
settings: partial.settings, targetFile: partialConfigDef.targetFile, configType: partial.configType, asset: partialConfigDef.asset, enterprise: partialConfigDef.enterprise, scope: partial.scope, target: partial.target, thisMachine: partial.thisMachine, description: partial.description, condition: partial.condition }, this.createAuditable());
|
|
323
331
|
return output;
|
|
324
332
|
}
|
|
325
333
|
catch (err) {
|
|
@@ -327,6 +335,40 @@ class ConfigAdd extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
327
335
|
}
|
|
328
336
|
});
|
|
329
337
|
}
|
|
338
|
+
promptForCondition(currentValue) {
|
|
339
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
340
|
+
let ultimate;
|
|
341
|
+
if (currentValue != undefined && !_.isEmpty(currentValue.trim())) {
|
|
342
|
+
// existing value
|
|
343
|
+
let keepCondition = yield this._ui.promptConfirm("keepCondition", "Condition: ".concat(this._styler.dim(currentValue)), true);
|
|
344
|
+
if (keepCondition) {
|
|
345
|
+
ultimate = currentValue;
|
|
346
|
+
}
|
|
347
|
+
else {
|
|
348
|
+
this._ui.userMessage(this._styler.dim("(empty value to remove)"));
|
|
349
|
+
ultimate = yield this._ui.prompt("condition", "Condition", false, currentValue); // TODO: consider validating this using jsonata(currentValue)
|
|
350
|
+
}
|
|
351
|
+
ultimate = ultimate === null || ultimate === void 0 ? void 0 : ultimate.trim();
|
|
352
|
+
}
|
|
353
|
+
else {
|
|
354
|
+
// no existing value
|
|
355
|
+
// const choices: choice<boolean>[] = [{ name: "Always", value: false }, { name: "** Conditionally **", value: true }];
|
|
356
|
+
// const setCondition = await this._ui.promptSelect("confirmCondition", "Included: ", choices);
|
|
357
|
+
let always = yield this._ui.promptConfirm("keepCondition", "Included: ".concat(this._styler.dim("(Always)")), true);
|
|
358
|
+
if (always !== true) {
|
|
359
|
+
ultimate = yield this._ui.prompt("condition", "Condition: ", false); // TODO: consider validating this using jsonata(currentValue)
|
|
360
|
+
ultimate = ultimate === null || ultimate === void 0 ? void 0 : ultimate.trim();
|
|
361
|
+
}
|
|
362
|
+
else {
|
|
363
|
+
ultimate = undefined;
|
|
364
|
+
}
|
|
365
|
+
}
|
|
366
|
+
if (_.isEmpty(ultimate)) {
|
|
367
|
+
ultimate = undefined;
|
|
368
|
+
}
|
|
369
|
+
return ultimate;
|
|
370
|
+
});
|
|
371
|
+
}
|
|
330
372
|
/** Fails silently; Logs any exceptions and returns undefined. */
|
|
331
373
|
getConfigSchema(configType, enterprise, asset) {
|
|
332
374
|
var _a;
|
|
@@ -449,6 +491,9 @@ class ConfigAdd extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
449
491
|
}
|
|
450
492
|
// }
|
|
451
493
|
}
|
|
494
|
+
if (ultimate.condition && !_.isEmpty(ultimate.condition.trim())) {
|
|
495
|
+
cmd.push("--condition", ["'", ultimate.condition.replace(/'/g, "''"), "'"].join()); // enclose in single quotes becuaase its a freeform expression (we could check for spaces, but we also want to allow for backslashes and other speial characters).
|
|
496
|
+
}
|
|
452
497
|
return cmd;
|
|
453
498
|
}
|
|
454
499
|
// private async promptForAsset(assets: AtLeast<Asset, "name">[]): Promise<string> {
|
|
@@ -811,6 +856,7 @@ ConfigAdd.flags = {
|
|
|
811
856
|
setting: core_1.Flags.string({ required: false, description: "The config key (in dotpath/JSONPath), relative to the root of the config." }),
|
|
812
857
|
"entire-file": core_1.Flags.boolean({ required: false, exclusive: ["setting", "type"], description: "Declares that the entire config doc content shall consist only of the value of this setting. If the system encounters this argument while assembling configs, it will ignore any other settings applied to the given target file." }),
|
|
813
858
|
value: core_1.Flags.string({ required: false, description: "The actual concrete data to be applied as the setting value." }),
|
|
859
|
+
condition: core_1.Flags.string({ required: false, description: "Jsonata Expression to determine whether to include this setting, applied against the built-in asset-version expression context (see https://jsonata.org for syntax)." }),
|
|
814
860
|
"value-stdin": core_1.Flags.boolean({ required: false, dependsOn: ["file"], exclusive: ["value"], description: "(for type=file only) Reads the actual concrete data to be applied as the setting value from the stdin io stream (see the help for examples)." }),
|
|
815
861
|
// TODO: Move these into the base class
|
|
816
862
|
silent: core_1.Flags.boolean({ exclusive: ["echo", "to-script"], description: 'Non-Interactive mode; executes without any user interaction and fails on any missing or invalid arguments.' }),
|