@codiac.io/codiac-cli 1.2.255 → 1.2.257
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.d.ts +5 -1
- package/dist/apis/codiac-api/gen/contracts.js +3 -0
- package/dist/apis/codiac-api/gen/contracts.js.map +1 -1
- package/dist/apis/codiac-relay/gen/client.d.ts +5 -1
- package/dist/apis/codiac-relay/gen/client.js +28 -0
- package/dist/apis/codiac-relay/gen/client.js.map +1 -1
- package/dist/apis/codiac-relay/gen/contracts.d.ts +19 -6
- package/dist/apis/codiac-relay/gen/contracts.js +1 -0
- package/dist/apis/codiac-relay/gen/contracts.js.map +1 -1
- package/dist/cli-common/argument-manager.d.ts +1 -1
- package/dist/cli-common/built-in-cli-user-input.d.ts +3 -2
- package/dist/cli-common/built-in-cli-user-input.js +3 -1
- package/dist/cli-common/built-in-cli-user-input.js.map +1 -1
- package/dist/cli-common/command-base.d.ts +1 -2
- package/dist/cli-common/command-base.js +13 -11
- package/dist/cli-common/command-base.js.map +1 -1
- package/dist/cli-common/entities/prompt-choice.d.ts +6 -2
- package/dist/cli-common/mock-ui.d.ts +2 -2
- package/dist/cli-common/mock-ui.js.map +1 -1
- package/dist/cli-common/prompt-select-fuzzy.d.ts +4 -5
- package/dist/cli-common/prompt-select-fuzzy.js +11 -9
- package/dist/cli-common/prompt-select-fuzzy.js.map +1 -1
- package/dist/cli-common/test/tenant-contextualizer.spec.js +2 -2
- package/dist/command-base-enterprise.d.ts +3 -3
- package/dist/command-base-enterprise.js +38 -22
- package/dist/command-base-enterprise.js.map +1 -1
- package/dist/command-base-exec.js.map +1 -1
- package/dist/command-base-tenantless.js +2 -2
- package/dist/command-base-tenantless.js.map +1 -1
- package/dist/commands/asset/create.d.ts +16 -1
- package/dist/commands/asset/create.js +239 -85
- package/dist/commands/asset/create.js.map +1 -1
- package/dist/commands/asset/deploy.d.ts +0 -4
- package/dist/commands/asset/deploy.js +3 -15
- package/dist/commands/asset/deploy.js.map +1 -1
- package/dist/commands/asset/destroy.js +3 -3
- package/dist/commands/asset/destroy.js.map +1 -1
- package/dist/commands/asset/recycle.js +5 -5
- package/dist/commands/asset/recycle.js.map +1 -1
- package/dist/commands/asset/view.d.ts +9 -6
- package/dist/commands/asset/view.js +220 -127
- package/dist/commands/asset/view.js.map +1 -1
- package/dist/commands/cabinet/create.js +20 -21
- package/dist/commands/cabinet/create.js.map +1 -1
- package/dist/commands/cabinet/obliterate.js +1 -1
- package/dist/commands/cabinet/obliterate.js.map +1 -1
- package/dist/commands/config/add.js +47 -24
- package/dist/commands/config/add.js.map +1 -1
- package/dist/commands/config/delete.js +8 -7
- package/dist/commands/config/delete.js.map +1 -1
- package/dist/commands/config/deploy.d.ts +2 -2
- package/dist/commands/config/deploy.js +121 -64
- package/dist/commands/config/deploy.js.map +1 -1
- package/dist/commands/config/import.d.ts +19 -5
- package/dist/commands/config/import.js +112 -52
- package/dist/commands/config/import.js.map +1 -1
- package/dist/commands/config/settings/get.js +7 -6
- package/dist/commands/config/settings/get.js.map +1 -1
- package/dist/commands/config/view.js +11 -4
- package/dist/commands/config/view.js.map +1 -1
- package/dist/commands/csp/login.js +3 -3
- package/dist/commands/csp/login.js.map +1 -1
- package/dist/commands/dep/list.js +2 -1
- package/dist/commands/dep/list.js.map +1 -1
- package/dist/commands/deploy.js +2 -2
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/env/add.d.ts +1 -1
- package/dist/commands/env/add.js +12 -12
- package/dist/commands/env/add.js.map +1 -1
- package/dist/commands/filestore/capture.js +22 -4
- package/dist/commands/filestore/capture.js.map +1 -1
- package/dist/commands/host/list.d.ts +30 -0
- package/dist/commands/host/list.js +106 -0
- package/dist/commands/host/list.js.map +1 -0
- package/dist/commands/host/map.js +7 -1
- package/dist/commands/host/map.js.map +1 -1
- package/dist/commands/host/view.d.ts +31 -0
- package/dist/commands/host/view.js +111 -0
- package/dist/commands/host/view.js.map +1 -0
- package/dist/commands/init.js +1 -2
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/kit/create.js +1 -1
- package/dist/commands/kit/create.js.map +1 -1
- package/dist/commands/login.js +3 -3
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/noc/cluster/deinit.d.ts +1 -0
- package/dist/commands/noc/cluster/deinit.js +4 -3
- package/dist/commands/noc/cluster/deinit.js.map +1 -1
- package/dist/commands/noc/cluster/destroy.js +3 -3
- package/dist/commands/noc/cluster/destroy.js.map +1 -1
- package/dist/commands/noc/cluster/forget.js +4 -4
- package/dist/commands/noc/cluster/forget.js.map +1 -1
- package/dist/commands/noc/cluster/grant.js +2 -2
- package/dist/commands/noc/cluster/grant.js.map +1 -1
- package/dist/commands/noc/cluster/init.js +3 -3
- package/dist/commands/noc/cluster/init.js.map +1 -1
- package/dist/commands/noc/cluster/recreate.js +2 -2
- package/dist/commands/noc/cluster/recreate.js.map +1 -1
- package/dist/commands/publish.js +3 -2
- package/dist/commands/publish.js.map +1 -1
- package/dist/ops/INTERFACES_CLI.d.ts +7 -1
- package/dist/ops/INTERFACES_CLI.js +7 -0
- package/dist/ops/INTERFACES_CLI.js.map +1 -1
- package/dist/ops/LocalOps.js +29 -28
- package/dist/ops/LocalOps.js.map +1 -1
- package/dist/ops/cli-path-walker.d.ts +18 -0
- package/dist/ops/cli-path-walker.js +58 -53
- package/dist/ops/cli-path-walker.js.map +1 -1
- package/dist/ops/data/cli-context-repo.js +11 -9
- package/dist/ops/data/cli-context-repo.js.map +1 -1
- package/dist/ops/i-entry-validator.d.ts +21 -0
- package/dist/ops/i-entry-validator.js +3 -0
- package/dist/ops/i-entry-validator.js.map +1 -0
- package/dist/ops/i-identity-handler.js +2 -2
- package/dist/ops/i-identity-handler.js.map +1 -1
- package/dist/ops/i-output-styler.d.ts +15 -0
- package/dist/ops/i-output-styler.js +1 -15
- package/dist/ops/i-output-styler.js.map +1 -1
- package/dist/ops/i-user-input-provider.d.ts +56 -0
- package/dist/ops/i-user-input-provider.js +12 -0
- package/dist/ops/i-user-input-provider.js.map +1 -0
- package/dist/ops/index.d.ts +8 -0
- package/dist/ops/index.js +8 -0
- package/dist/ops/index.js.map +1 -1
- package/dist/ops/no-style-output-styler.d.ts +12 -0
- package/dist/ops/no-style-output-styler.js +34 -28
- package/dist/ops/no-style-output-styler.js.map +1 -1
- package/dist/ops/ops-constants.d.ts +7 -0
- package/dist/ops/ops-constants.js +12 -0
- package/dist/ops/ops-constants.js.map +1 -0
- package/dist/ops/test/mock-ui.d.ts +1 -1
- package/dist/ops/test/when-git-branchline-is-attempted.spec.js +5 -4
- package/dist/ops/test/when-git-branchline-is-attempted.spec.js.map +1 -1
- package/dist/ops/test/when-versions-are-parsed.spec.js +3 -2
- package/dist/ops/test/when-versions-are-parsed.spec.js.map +1 -1
- package/dist/ops/throwing-user-input-provider.d.ts +24 -0
- package/dist/ops/throwing-user-input-provider.js +65 -35
- package/dist/ops/throwing-user-input-provider.js.map +1 -1
- package/dist/prettify.js.map +1 -1
- package/dist/relay/contracts/contracts.d.ts +2 -20
- package/dist/relay/contracts/contracts.js +24 -30
- package/dist/relay/contracts/contracts.js.map +1 -1
- package/dist/relay/extended-relay-client.d.ts +0 -27
- package/dist/relay/extended-relay-client.js +36 -26
- package/dist/relay/extended-relay-client.js.map +1 -1
- package/dist/relay/relay-container.d.ts +1 -1
- package/dist/relay/relay-container.js +6 -6
- package/dist/relay/relay-container.js.map +1 -1
- package/dist/uilogic/build-configurator.d.ts +1 -1
- package/dist/uilogic/build-configurator.js +3 -3
- package/dist/uilogic/build-configurator.js.map +1 -1
- package/dist/uilogic/cloud-provider-contextualizer.d.ts +2 -4
- package/dist/uilogic/cloud-provider-contextualizer.js +9 -15
- package/dist/uilogic/cloud-provider-contextualizer.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurator-factory.js +5 -0
- package/dist/uilogic/cloud-resource-configurator-factory.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/aws-resource-configurator.d.ts +3 -4
- package/dist/uilogic/cloud-resource-configurators/aws-resource-configurator.js +10 -13
- package/dist/uilogic/cloud-resource-configurators/aws-resource-configurator.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/az-interactive-login-configurator.d.ts +2 -1
- package/dist/uilogic/cloud-resource-configurators/az-interactive-login-configurator.js +4 -3
- package/dist/uilogic/cloud-resource-configurators/az-interactive-login-configurator.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/azure-resource-configurator.d.ts +3 -4
- package/dist/uilogic/cloud-resource-configurators/azure-resource-configurator.js +27 -24
- package/dist/uilogic/cloud-resource-configurators/azure-resource-configurator.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/docker-hub-resource-configurator.d.ts +1 -1
- package/dist/uilogic/cloud-resource-configurators/docker-hub-resource-configurator.js +3 -3
- package/dist/uilogic/cloud-resource-configurators/docker-hub-resource-configurator.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/helm-resource-configurator.d.ts +2 -2
- package/dist/uilogic/cloud-resource-configurators/helm-resource-configurator.js +7 -4
- package/dist/uilogic/cloud-resource-configurators/helm-resource-configurator.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/unsupported-resource-configurator.d.ts +1 -1
- package/dist/uilogic/cloud-resource-configurators/unsupported-resource-configurator.js +2 -2
- package/dist/uilogic/cloud-resource-configurators/unsupported-resource-configurator.js.map +1 -1
- package/dist/uilogic/config-ui-utils.d.ts +3 -3
- package/dist/uilogic/config-ui-utils.js +24 -13
- package/dist/uilogic/config-ui-utils.js.map +1 -1
- package/dist/uilogic/enterprise-contextualizer.d.ts +1 -1
- package/dist/uilogic/environment-contextualizer.d.ts +1 -1
- package/dist/uilogic/image-configurator.d.ts +2 -2
- package/dist/uilogic/image-configurator.js +1 -1
- package/dist/uilogic/image-configurator.js.map +1 -1
- package/dist/uilogic/image-contextualizer.d.ts +1 -1
- package/dist/uilogic/image-contextualizer.js +11 -6
- package/dist/uilogic/image-contextualizer.js.map +1 -1
- package/dist/uilogic/image-registry-contextualizer.d.ts +7 -1
- package/dist/uilogic/image-registry-contextualizer.js +56 -3
- package/dist/uilogic/image-registry-contextualizer.js.map +1 -1
- package/dist/uilogic/prompt-select-fuzzy.js +3 -3
- package/dist/uilogic/prompt-select-fuzzy.js.map +1 -1
- package/dist/uilogic/render-methods.d.ts +1 -0
- package/dist/uilogic/render-methods.js +2 -1
- package/dist/uilogic/render-methods.js.map +1 -1
- package/dist/uilogic/rootmap-ui-utils.d.ts +28 -8
- package/dist/uilogic/rootmap-ui-utils.js +132 -8
- package/dist/uilogic/rootmap-ui-utils.js.map +1 -1
- package/dist/uilogic/tenant-contextualizer.d.ts +1 -1
- package/dist/user-context-loader.js +4 -3
- package/dist/user-context-loader.js.map +1 -1
- package/oclif.manifest.json +210 -28
- package/package.json +4 -5
- package/dist/cli-common/i-user-input-provider.d.ts +0 -0
- package/dist/cli-common/i-user-input-provider.js +0 -19
- package/dist/cli-common/i-user-input-provider.js.map +0 -1
- package/dist/cli-common/tenant-contextualizer.d.ts +0 -0
- package/dist/cli-common/tenant-contextualizer.js +0 -436
- package/dist/cli-common/tenant-contextualizer.js.map +0 -1
- package/dist/ops/docker-registry-api-client/docker-registry-api-client.d.ts +0 -0
- package/dist/ops/docker-registry-api-client/docker-registry-api-client.js +0 -289
- package/dist/ops/docker-registry-api-client/docker-registry-api-client.js.map +0 -1
- package/dist/uilogic/cloud-resource-configurators/az-acr-cli-authenticator.d.ts +0 -0
- package/dist/uilogic/cloud-resource-configurators/az-acr-cli-authenticator.js +0 -78
- package/dist/uilogic/cloud-resource-configurators/az-acr-cli-authenticator.js.map +0 -1
|
@@ -0,0 +1,111 @@
|
|
|
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 YAML = require("yaml");
|
|
6
|
+
const command_base_exec_1 = require("../../command-base-exec");
|
|
7
|
+
const config_ui_utils_1 = require("../../uilogic/config-ui-utils");
|
|
8
|
+
const prettify_1 = require("../../prettify");
|
|
9
|
+
const _ = require("lodash");
|
|
10
|
+
const output_format_enum_1 = require("../../cli-entities/output-format-enum");
|
|
11
|
+
class HostView extends command_base_exec_1.CommandBaseExec {
|
|
12
|
+
captureArgs(enterpriseCode) {
|
|
13
|
+
var _a, _b;
|
|
14
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
|
+
const { args, flags } = yield this.parse(HostView);
|
|
16
|
+
let partial = {
|
|
17
|
+
enterprise: enterpriseCode
|
|
18
|
+
};
|
|
19
|
+
if (flags.output)
|
|
20
|
+
partial.outputFormat = output_format_enum_1.OutputFormatEnum[flags.output];
|
|
21
|
+
// ---------------------------------------------------------------
|
|
22
|
+
// TODO: move everything from here down into the base class
|
|
23
|
+
// ---------------------------------------------------------------
|
|
24
|
+
const interactionMode = (this.pipedInput) ? config_ui_utils_1.InteractionModes.silent : (_b = (_a = undefined !== null && undefined !== void 0 ? undefined : (flags.echo ? config_ui_utils_1.InteractionModes.echo : undefined)) !== null && _a !== void 0 ? _a : (flags["to-script"] ? config_ui_utils_1.InteractionModes.toscript : undefined)) !== null && _b !== void 0 ? _b : (flags.silent ? config_ui_utils_1.InteractionModes.silent : undefined);
|
|
25
|
+
const takeDefaults = flags['take-defaults'];
|
|
26
|
+
return [partial, interactionMode, takeDefaults];
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
buildCandidate_silently(partial, rootMap) {
|
|
30
|
+
var _a;
|
|
31
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
32
|
+
let candidate = {
|
|
33
|
+
enterprise: partial.enterprise,
|
|
34
|
+
outputFormat: (_a = partial.outputFormat) !== null && _a !== void 0 ? _a : output_format_enum_1.OutputFormatEnum.pretty
|
|
35
|
+
};
|
|
36
|
+
return candidate;
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
buildCandidate_interactively(partial, rootMap, takeDefaults) {
|
|
40
|
+
var _a;
|
|
41
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
42
|
+
let candidate = {
|
|
43
|
+
enterprise: partial.enterprise,
|
|
44
|
+
outputFormat: (_a = partial.outputFormat) !== null && _a !== void 0 ? _a : output_format_enum_1.OutputFormatEnum.pretty
|
|
45
|
+
};
|
|
46
|
+
return candidate;
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
buildCommandString(candidate, cmd) {
|
|
50
|
+
// the domain argument
|
|
51
|
+
// if (candidate.domainName) cmd.push("\"".concat(candidate.domainName, "\""));
|
|
52
|
+
// TODO: Capture takeDefaults
|
|
53
|
+
cmd.push("--silent");
|
|
54
|
+
return cmd;
|
|
55
|
+
}
|
|
56
|
+
executeTask(candidate) {
|
|
57
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
58
|
+
let req = Object.assign({}, _.omit(candidate, "outputFormat"));
|
|
59
|
+
let result = yield this.genRelayClient.Call.getIngressMap(req);
|
|
60
|
+
if (result.error)
|
|
61
|
+
throw result.error;
|
|
62
|
+
if (result.output == undefined)
|
|
63
|
+
throw new Error("No ingress map was found."); // <-- this case should never exist; it would be an empty object if nothing existed, not an undefined.
|
|
64
|
+
// let output = JSON.stringify(result.output, undefined, ' ');
|
|
65
|
+
// let output = prettify(result.output);
|
|
66
|
+
let output = this.renderAs(result.output, candidate.outputFormat);
|
|
67
|
+
console.log(output);
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
renderAs(object, format) {
|
|
71
|
+
let output = "";
|
|
72
|
+
switch (format) {
|
|
73
|
+
case output_format_enum_1.OutputFormatEnum.json:
|
|
74
|
+
output = JSON.stringify(object, undefined, 2);
|
|
75
|
+
break;
|
|
76
|
+
case output_format_enum_1.OutputFormatEnum.yaml:
|
|
77
|
+
output = YAML.stringify(object, { indent: 2 });
|
|
78
|
+
break;
|
|
79
|
+
case output_format_enum_1.OutputFormatEnum.pretty:
|
|
80
|
+
default:
|
|
81
|
+
output = (0, prettify_1.prettify)(object);
|
|
82
|
+
break;
|
|
83
|
+
}
|
|
84
|
+
return output;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
exports.default = HostView;
|
|
88
|
+
HostView.description = 'Retrieves the overall map of domain routes for the given enterprise, resulting from the current host mapping strategies, environments, and assets.';
|
|
89
|
+
HostView.examples = [
|
|
90
|
+
'<%= config.bin %> <%= command.id %>',
|
|
91
|
+
];
|
|
92
|
+
HostView.flags = {
|
|
93
|
+
// scope
|
|
94
|
+
// target
|
|
95
|
+
enterprise: core_1.Flags.string({ char: 'e', description: '(optional if there is only one) The enterprise in which the domains have been mapped.' }),
|
|
96
|
+
// cluster
|
|
97
|
+
// cabinet
|
|
98
|
+
// domain
|
|
99
|
+
// strategy
|
|
100
|
+
// output list, table, json, yaml (wd love to have jmespath and/or a template and/or a projection)
|
|
101
|
+
output: core_1.Flags.string({ char: 'o', default: output_format_enum_1.OutputFormatEnum.pretty, description: "format in which to render the data.", options: [output_format_enum_1.OutputFormatEnum.json, output_format_enum_1.OutputFormatEnum.yaml, output_format_enum_1.OutputFormatEnum.pretty] }),
|
|
102
|
+
// TODO: Move these into the base class
|
|
103
|
+
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.' }),
|
|
104
|
+
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.' }),
|
|
105
|
+
"to-script": core_1.Flags.boolean({ exclusive: ["echo", "silent"], description: 'Toscript interaction mode; renders the equivalent non-interactive cli command WITHOUT any execution.' }),
|
|
106
|
+
"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." })
|
|
107
|
+
};
|
|
108
|
+
HostView.args = {
|
|
109
|
+
domain: core_1.Args.string({ description: 'domain name to filter on (without any wildcards), eg: `yoursite.com`' }),
|
|
110
|
+
};
|
|
111
|
+
//# sourceMappingURL=view.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../src/commands/host/view.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/init.js
CHANGED
|
@@ -5,7 +5,6 @@ const core_1 = require("@oclif/core");
|
|
|
5
5
|
const path = require("path");
|
|
6
6
|
const codiac_common_1 = require("@codiac.io/codiac-common");
|
|
7
7
|
const ops_1 = require("../ops");
|
|
8
|
-
const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
|
|
9
8
|
const ops_2 = require("../ops");
|
|
10
9
|
const command_base_tenantless_1 = require("../command-base-tenantless");
|
|
11
10
|
class Init extends command_base_tenantless_1.CommandBaseTenantless {
|
|
@@ -70,7 +69,7 @@ class Init extends command_base_tenantless_1.CommandBaseTenantless {
|
|
|
70
69
|
}
|
|
71
70
|
}
|
|
72
71
|
this._ui.userMessage(`Initializing project folder: ${directory}`);
|
|
73
|
-
if (
|
|
72
|
+
if (ops_2.CliPathWalker.isConfigRoot(directory)) {
|
|
74
73
|
let redo = yield this._ui.promptConfirm("reinit", this._styler.colorWarning('This folder is already a project root! Re-initialize? ') + "(y/n)");
|
|
75
74
|
if (!redo) {
|
|
76
75
|
this.log('Operation cancelled. No work was done.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":";;;AAAA,sCAAkD;AAClD,6BAA6B;AAE7B,4DAAqD;AACrD,gCAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@ class KitCreate extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
31
31
|
asset = yield this.promptForAsset(enterpriseCode, flags.asset);
|
|
32
32
|
}
|
|
33
33
|
// 2) Generate the kit
|
|
34
|
-
let kitRes = yield this.
|
|
34
|
+
let kitRes = yield this.genRelayClient.Call.getGenerateAssetFromKit({ kitName: asset.name, targetEnterprise: asset.enterprise });
|
|
35
35
|
if (kitRes.success && kitRes.output) {
|
|
36
36
|
let candidate = kitRes.output;
|
|
37
37
|
// Loop thru the kit properties and allow the user to override.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/kit/create.ts"],"names":[],"mappings":";;;;AAAA,sCAA0C;AAC1C,qCAAsC;AAEtC,mGAAmG;AACnG,+DAAuG;AACvG,2EAAsE;AACtE,6CAA0C;AAG1C;;4DAE4D;AAC/C,QAAA,oBAAoB,GAAG,GAAG,CAAC;AAGxC,MAAqB,SAAU,SAAQ,+CAAqB;IAoBlD,GAAG;;YAEL,OAAO,IAAI,OAAO,CAAO,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC/C,IAAI;oBACA,IAAI,CAAC,SAAS,EAAE,CAAC;oBACjB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;oBAEpD,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBACnE,IAAI,iBAAiB,GAAG,CAAC,MAAM,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;oBAC7F,IAAI,cAAc,GAAG,iBAAiB,CAAC,IAAI,CAAC;oBAE5C,0BAA0B;oBAC1B,IAAI,KAAY,CAAC;oBACjB,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,IAAI,4BAAoB,EAAE;wBACrD,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;qBACrD;yBAAM,sBAAsB,CAAC;wBAC1B,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;qBAClE;oBAED,sBAAsB;oBACtB,IAAI,MAAM,GAAsB,MAAM,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/kit/create.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/login.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const core_1 = require("@oclif/core");
|
|
5
5
|
//import { BuiltInCliUserInput } from '../cli-common/built-in-cli-user-input';
|
|
6
|
-
const
|
|
6
|
+
const ops_1 = require("../ops");
|
|
7
7
|
const uilogic_1 = require("../uilogic");
|
|
8
8
|
const read_stdin_1 = require("../read-stdin");
|
|
9
9
|
const command_base_enterprise_1 = require("../command-base-enterprise");
|
|
@@ -38,8 +38,8 @@ class Login extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
38
38
|
if (flags.passwordIn === true)
|
|
39
39
|
flags.silent = true;
|
|
40
40
|
if (flags.silent === true) {
|
|
41
|
-
this.__ui = new
|
|
42
|
-
this.__styler = new
|
|
41
|
+
this.__ui = new ops_1.ThrowingUserInputProvider(this.logger, (flags.tokenOut) ? "suppress" : "write");
|
|
42
|
+
this.__styler = new ops_1.NoStyleOutputStyler();
|
|
43
43
|
}
|
|
44
44
|
let defaultPassword = flags.password;
|
|
45
45
|
if (flags.passwordIn === true) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":";;;AAAA,sCAA4C;AAI5C,8EAA8E;AAC9E,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
+
require("reflect-metadata");
|
|
4
5
|
const core_1 = require("@oclif/core");
|
|
5
6
|
const contracts_1 = require("../../../apis/codiac-api/contracts");
|
|
6
|
-
const
|
|
7
|
+
const ops_1 = require("../../../ops");
|
|
7
8
|
const command_base_enterprise_1 = require("../../../command-base-enterprise");
|
|
8
9
|
class NocClusterDeinit extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
9
10
|
run() {
|
|
@@ -17,7 +18,7 @@ class NocClusterDeinit extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
17
18
|
var _b;
|
|
18
19
|
try {
|
|
19
20
|
if (flags.silent)
|
|
20
|
-
this.__ui = new
|
|
21
|
+
this.__ui = new ops_1.ThrowingUserInputProvider(this.logger);
|
|
21
22
|
this._userCntx = yield this.establishTenantContext(this._userCntx);
|
|
22
23
|
// Ensure that the type alias matches the projection...
|
|
23
24
|
let projection = { pathsIncluded: ["id", "name", "provider", "locationName", "privateOwner", "instance"], pathsExcluded: [] };
|
|
@@ -73,7 +74,7 @@ class NocClusterDeinit extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
73
74
|
yield this.cspContextualizer.promptForCloudProviderCreds(this.ioc, cluster.provider);
|
|
74
75
|
}
|
|
75
76
|
this._ui.startSpinner(`Deinitializing cluster: ${this._styler.hilite(cluster.name)}`);
|
|
76
|
-
let resultIngress = yield this.
|
|
77
|
+
let resultIngress = yield this.genRelayClient.Call.postExecuteClusterIngressDelete({ clusterName: cluster.name });
|
|
77
78
|
this._ui.stopSpinner(resultIngress.success ? "SUCCESS" : "FAILED");
|
|
78
79
|
let msg = `Cluster Deinitialize ${resultIngress.success ? "SUCCESS" : "FAILED"}: ${resultIngress.message || ""}`;
|
|
79
80
|
this.logger.debug(msg, resultIngress);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deinit.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/deinit.ts"],"names":[],"mappings":";;;AAAA,sCAA0C;AAE1C,kEAAuG;AACvG,
|
|
1
|
+
{"version":3,"file":"deinit.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/deinit.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const core_1 = require("@oclif/core");
|
|
5
5
|
const codiac_domain_1 = require("@codiac.io/codiac-domain");
|
|
6
6
|
const command_base_enterprise_1 = require("../../../command-base-enterprise");
|
|
7
|
-
const
|
|
7
|
+
const ops_1 = require("../../../ops");
|
|
8
8
|
class NocClusterDestroy extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
9
9
|
run() {
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -16,7 +16,7 @@ class NocClusterDestroy extends command_base_enterprise_1.CommandBaseEnterprise
|
|
|
16
16
|
(_a = this._relayContainer) === null || _a === void 0 ? void 0 : _a.ready$.subscribe((ready) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
17
|
var _b, _c;
|
|
18
18
|
if (flags.silent)
|
|
19
|
-
this.__ui = new
|
|
19
|
+
this.__ui = new ops_1.ThrowingUserInputProvider(this.logger);
|
|
20
20
|
this._userCntx = yield this.establishTenantContext(this._userCntx);
|
|
21
21
|
let deleteIdentity = flags.deleteIdentity;
|
|
22
22
|
// let clusterName: string | undefined;
|
|
@@ -96,7 +96,7 @@ class NocClusterDestroy extends command_base_enterprise_1.CommandBaseEnterprise
|
|
|
96
96
|
yield this.cspContextualizer.promptForCloudProviderCreds(this.ioc, cluster.provider);
|
|
97
97
|
}
|
|
98
98
|
this._ui.startSpinner(`Destroying physical cluster instance: ${this._styler.hilite(cluster.name)}...`);
|
|
99
|
-
let result = yield this.
|
|
99
|
+
let result = yield this.genRelayClient.Call.postExecuteDeleteClusterInstance({ name: cluster.name, deleteIdentity: deleteIdentity });
|
|
100
100
|
this._ui.stopSpinner(result.success ? "SUCCESS" : "FAILED");
|
|
101
101
|
let msg = `Cluster destroy ${result.success ? this._styler.colorGood("SUCCESS") : this._styler.colorCritical("FAILED")}: ${result.message || ""}`;
|
|
102
102
|
this.logger.debug(msg, result);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/destroy.ts"],"names":[],"mappings":";;;AAAA,sCAA0C;AAE1C,4DAAyE;AAGzE,8EAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/destroy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
const codiac_domain_1 = require("@codiac.io/codiac-domain");
|
|
5
|
-
const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
|
|
6
|
-
const core_1 = require("@oclif/core");
|
|
7
4
|
const _ = require("lodash");
|
|
5
|
+
const core_1 = require("@oclif/core");
|
|
6
|
+
const codiac_domain_1 = require("@codiac.io/codiac-domain");
|
|
7
|
+
const ops_1 = require("../../../ops");
|
|
8
8
|
const command_base_enterprise_1 = require("../../../command-base-enterprise");
|
|
9
9
|
class NocClusterForget extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
10
10
|
bootstrap() {
|
|
@@ -19,7 +19,7 @@ class NocClusterForget extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
19
19
|
const { args, flags } = yield this.parse(NocClusterForget);
|
|
20
20
|
(_a = this._relayContainer) === null || _a === void 0 ? void 0 : _a.ready$.subscribe(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
21
21
|
if (flags.silent)
|
|
22
|
-
this.__ui = new
|
|
22
|
+
this.__ui = new ops_1.ThrowingUserInputProvider(this.logger); // <--- Isnt this built into the command base somewhere?
|
|
23
23
|
this._userCntx = yield this.establishTenantContext(this._userCntx);
|
|
24
24
|
let provider = flags.provider ? codiac_domain_1.CloudProviderEnum[flags.provider] : undefined;
|
|
25
25
|
let cluster = yield this.promptForCluster(flags.name, provider, flags.silent);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forget.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/forget.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"forget.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/forget.ts"],"names":[],"mappings":";;;AAAA,4BAA6B;AAC7B,sCAAmC;AAEnC,4DAA6D;AAC7D,sCAAyD;AAEzD,8EAAwE;AAExE,MAAqB,gBAAiB,SAAQ,+CAAqB;IAmBvD,SAAS;QACjB,KAAK,CAAC,SAAS,EAAE,CAAC;IACpB,CAAC;IAGY,GAAG;;YACd,OAAO,IAAI,OAAO,CAAO,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;;gBACjD,IAAI;oBACF,IAAI,CAAC,SAAS,EAAE,CAAC;oBACjB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;oBAC1D,MAAA,IAAI,CAAC,eAAe,0CAAE,MAAM,CACzB,SAAS,CAAC,GAAS,EAAE;wBACpB,IAAI,KAAK,CAAC,MAAM;4BAAE,IAAI,CAAC,IAAI,GAAG,IAAI,+BAAyB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAE,wDAAwD;wBACnI,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;wBAEnE,IAAI,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAO,iCAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;wBAErF,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;wBAE9E,wBAAwB;wBACxB,IAAI,OAAO,EAAE;4BAEX,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,OAAO,CAAC,QAAQ,aAAa,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;4BAEzG,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,EAAG,EAAE,EAAE,EAAE,CAAC,CAAC;4BACjF,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;4BAE5D,IAAI,GAAG,GAAG,kBAAkB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;4BACjJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;4BAC/B,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;yBAC3B;wBAGD,OAAO,EAAE,CAAC;oBACZ,CAAC,CAAA,CAAC,CAAC;iBACN;gBAAC,OAAO,GAAG,EAAE;oBACZ,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;YACH,CAAC,CAAA,CAAC,CAAC;QACL,CAAC;KAAA;IAKa,gBAAgB,CAAC,IAAa,EAAE,QAA4B,EAAE,MAAgB;;;YAC1F,IAAI;gBAEF,oFAAoF;gBACpF,gFAAgF;gBAChF,+HAA+H;gBAC/H,wGAAwG;gBACxG,sCAAsC;gBACtC,yCAAyC;gBAEzC,2BAA2B;gBAC3B,IAAI,OAA6G,CAAC;gBAClH,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBACrN,IAAI,WAAW,GAAG,MAAA,UAAU,CAAC,MAAM,mCAAI,EAAE,CAAC;gBAC1C,WAAW,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAElD,IAAI,QAAQ,EAAE;oBACZ,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC;iBAC/D;gBAED,IAAI,UAAU,CAAC,KAAK,IAAI,SAAS,IAAI,CAAC,WAAW,IAAI,SAAS,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE;oBAC3F,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;iBAC3C;qBAAM;oBAEL,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,SAAS,CAAC,CAAC,CAAE,2DAA2D;oBAE5H,IAAI,UAAU,CAAC,KAAK,IAAI,SAAS,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;wBAC7D,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,qCAAqC,CAAC,CAAC;qBAE7D;yBAAM,IAAI,MAAM,KAAK,IAAI,EAAE;wBAC1B,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;wBAC5E,IAAI,OAAO,IAAI,SAAS,EAAE;4BACxB,wGAAwG;4BACxG,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC,CAAE,2BAA2B;yBACpG;qBAEF;yBAAM;wBAEL,IAAI,SAAS,GAA2D,EAAE,CAAC;wBAC3E,IAAI,IAAI;4BAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC;wBAChC,IAAI,OAAO,GAAG,KAAK,CAAC;wBACpB,GAAG;4BACD,IAAI,UAAU,CAAC,KAAK,EAAE;gCACpB,8EAA8E;gCAC9E,wEAAwE;gCACxE,IAAI,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gCAC1D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;gCACpF,MAAM,IAAI,GAAW,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,sCAAsC,EAAE,IAAI,CAAC,CAAC,CAAC;gCAC1G,OAAO,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;6BAEhG;iCAAM,EAAG,iFAAiF;gCACzF,IAAI,KAAK,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gCAC5F,IAAI,KAAK,EAAE;oCACT,OAAO,GAAG,KAAK,CAAC;iCACjB;qCAAM;oCACL,IAAI,OAAO,GAAG,WAAW;yCACtB,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;oCACnE,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,aAAa,EAAE,+BAA+B,EAAE,OAAO,CAAC,CAAE,CAAC;oCACrG,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAE,CAAC;iCACrD;6BACF;4BACD,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,eAAe,EAAE,uBAAuB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;4BACxI,IAAI,CAAC,OAAO;gCAAE,SAAS,GAAG,EAAE,CAAC,CAAE,wGAAwG;yBAExI,QAAQ,OAAO,KAAK,IAAI,EAAC;qBAC3B;iBAIF;gBAED,OAAO,OAAO,CAAC;aAChB;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,GAAG,CAAC;aACX;;KACF;IAID,mDAAmD;IAC3C,QAAQ,CAAC,OAAkJ;;QAEjK,MAAM,UAAU,GAAG,QAAQ,CAAC;QAE5B,IAAI,IAAI,GAAG,KAAK,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,UAAU,GAAG,CAAC;QACpH,IAAI,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,MAAA,OAAO,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC,kBAAkB,EAAE,QAAQ,OAAO,CAAC,UAAU,GAAG,CAAC;QAEnG,OAAO,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;IAC/E,CAAC;;AAvJH,mCAyJC;AAxJQ,4BAAW,GAAG,8OAA8O,CAAA,CAAE,mGAAmG;AAExW,sBAAsB;AACtB,2CAA2C;AAC3C,IAAI;AAEG,wBAAO,GAAa,CAAC,gBAAgB,CAAC,CAAC;AAEvC,sBAAK,GAAG;IACb,IAAI,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,sBAAsB,EAAE,CAAC;IACvF,QAAQ,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,iCAAiB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,sCAAsC,EAAE,CAAC;IACpJ,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,qGAAqG,EAAE,CAAC;CAC3M,CAAA;AAEM,qBAAI,GAAG,EACb,CAAA"}
|
|
@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const core_1 = require("@oclif/core");
|
|
5
5
|
const codiac_domain_1 = require("@codiac.io/codiac-domain");
|
|
6
6
|
const command_base_enterprise_1 = require("../../../command-base-enterprise");
|
|
7
|
-
const
|
|
7
|
+
const ops_1 = require("../../../ops");
|
|
8
8
|
const _ = require("lodash");
|
|
9
9
|
class NocClusterGrant extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
10
10
|
constructor() {
|
|
@@ -21,7 +21,7 @@ class NocClusterGrant extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
21
21
|
(_a = this._relayContainer) === null || _a === void 0 ? void 0 : _a.ready$.subscribe((ready) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
22
|
var _b;
|
|
23
23
|
if (flags.silent)
|
|
24
|
-
this.__ui = new
|
|
24
|
+
this.__ui = new ops_1.ThrowingUserInputProvider(this.logger);
|
|
25
25
|
this._userCntx = yield this.establishTenantContext(this._userCntx);
|
|
26
26
|
let grant;
|
|
27
27
|
this.clusterDefs = yield this.loadClusters();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grant.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/grant.ts"],"names":[],"mappings":";;;AAAA,sCAA0C;AAE1C,4DAA6D;AAG7D,8EAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"grant.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/grant.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const core_1 = require("@oclif/core");
|
|
5
5
|
const codiac_domain_1 = require("@codiac.io/codiac-domain");
|
|
6
6
|
const command_base_enterprise_1 = require("../../../command-base-enterprise");
|
|
7
|
-
const
|
|
7
|
+
const ops_1 = require("../../../ops");
|
|
8
8
|
class NocClusterInit extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
9
9
|
run() {
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -17,7 +17,7 @@ class NocClusterInit extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
17
17
|
var _b;
|
|
18
18
|
try {
|
|
19
19
|
if (flags.silent)
|
|
20
|
-
this.__ui = new
|
|
20
|
+
this.__ui = new ops_1.ThrowingUserInputProvider(this.logger);
|
|
21
21
|
this._userCntx = yield this.establishTenantContext(this._userCntx);
|
|
22
22
|
let provider = (flags.provider) ? codiac_domain_1.CloudProviderEnum[flags.provider] : undefined;
|
|
23
23
|
let cluster;
|
|
@@ -73,7 +73,7 @@ class NocClusterInit extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
73
73
|
yield this.cspContextualizer.promptForCloudProviderCreds(this.ioc, cluster.provider);
|
|
74
74
|
}
|
|
75
75
|
this._ui.startSpinner(`Initializing cluster: ${this._styler.hilite(cluster.name)}`);
|
|
76
|
-
let resultIngress = yield this.
|
|
76
|
+
let resultIngress = yield this.genRelayClient.Call.postExecuteClusterIngressCreate({ clusterName: cluster.name });
|
|
77
77
|
this._ui.stopSpinner(resultIngress.success ? "SUCCESS" : "FAILED");
|
|
78
78
|
let msg = `Cluster Initialize ${resultIngress.success ? this._styler.colorGood("SUCCESS") : this._styler.colorCritical("FAILED")}: ${resultIngress.message || ""}`;
|
|
79
79
|
this.logger.debug(msg, resultIngress);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/init.ts"],"names":[],"mappings":";;;AAAA,sCAA0C;AAE1C,4DAAqF;AAErF,8EAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -123,7 +123,7 @@ class NocClusterRecreate extends command_base_enterprise_1.CommandBaseEnterprise
|
|
|
123
123
|
yield this.cspContextualizer.promptForCloudProviderCreds(this.ioc, existing.provider);
|
|
124
124
|
// tear down existing cluster
|
|
125
125
|
this._ui.startSpinner(`Tearing down existing cluster instance [${existing.name}]...`);
|
|
126
|
-
let teardownResult = yield this.
|
|
126
|
+
let teardownResult = yield this.genRelayClient.Call.postExecuteDeleteClusterInstance({ name: existing.name, deleteIdentity: false });
|
|
127
127
|
if (teardownResult.error) {
|
|
128
128
|
this._ui.stopSpinner(`Error: ${teardownResult.error.name} ${teardownResult.error.message || ""}`);
|
|
129
129
|
throw teardownResult.error;
|
|
@@ -134,7 +134,7 @@ class NocClusterRecreate extends command_base_enterprise_1.CommandBaseEnterprise
|
|
|
134
134
|
this._ui.stopSpinner(`Successfully deleted existing cluster instance [${existing.name}].`);
|
|
135
135
|
// Create new cluster instance
|
|
136
136
|
this._ui.startSpinner(this._styler.hilite(`Recreating Cluster [${newClusterDef.name}]. (this will take several minutes...)`));
|
|
137
|
-
let result = yield this.
|
|
137
|
+
let result = yield this.genRelayClient.Call.postExecuteClusterCreate({ spec: newClusterDef });
|
|
138
138
|
this._ui.stopSpinner(result.success ? "SUCCEEDED" : "FAILED");
|
|
139
139
|
if (result.error) {
|
|
140
140
|
let msg = `Error re-creating cluster [${newClusterDef.name}]: ${result.message} ${result.error.message || ""}`;
|