@codiac.io/codiac-cli 1.3.68 → 1.3.70
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/api-plus-local/api-client-plus-local.d.ts +12 -4
- package/dist/apis/api-plus-local/api-client-plus-local.js +121 -92
- package/dist/apis/api-plus-local/api-client-plus-local.js.map +1 -1
- package/dist/apis/api-plus-local/asset-where-entity-merger.d.ts +4 -2
- package/dist/apis/api-plus-local/asset-where-entity-merger.js +17 -8
- package/dist/apis/api-plus-local/asset-where-entity-merger.js.map +1 -1
- package/dist/apis/api-plus-local/enterprise-state-entity-merger.d.ts +3 -2
- package/dist/apis/api-plus-local/enterprise-state-entity-merger.js +13 -2
- package/dist/apis/api-plus-local/enterprise-state-entity-merger.js.map +1 -1
- package/dist/apis/api-plus-local/root-map-entity-merger.d.ts +7 -3
- package/dist/apis/api-plus-local/root-map-entity-merger.js +19 -8
- package/dist/apis/api-plus-local/root-map-entity-merger.js.map +1 -1
- package/dist/apis/codiac-api/gen/contracts.d.ts +38 -4
- package/dist/apis/codiac-api/gen/contracts.js +2 -0
- package/dist/apis/codiac-api/gen/contracts.js.map +1 -1
- package/dist/apis/codiac-relay/common/api-user-creds.d.ts +2 -2
- package/dist/apis/codiac-relay/common/api-user-creds.js +2 -1
- package/dist/apis/codiac-relay/common/api-user-creds.js.map +1 -1
- package/dist/apis/codiac-relay/gen/client.d.ts +5 -1
- package/dist/apis/codiac-relay/gen/client.js +16 -0
- package/dist/apis/codiac-relay/gen/client.js.map +1 -1
- package/dist/apis/codiac-relay/gen/contracts.d.ts +131 -2
- package/dist/apis/codiac-relay/gen/contracts.js +12 -1
- package/dist/apis/codiac-relay/gen/contracts.js.map +1 -1
- package/dist/apis/nats/nats-client.d.ts +1 -0
- package/dist/apis/nats/nats-client.js +8 -4
- package/dist/apis/nats/nats-client.js.map +1 -1
- package/dist/cli-common/argument-manager.d.ts +1 -1
- package/dist/cli-common/command-base.d.ts +6 -4
- package/dist/cli-common/command-base.js +31 -22
- package/dist/cli-common/command-base.js.map +1 -1
- package/dist/codiac-constants.d.ts +2 -0
- package/dist/codiac-constants.js +2 -0
- package/dist/codiac-constants.js.map +1 -1
- package/dist/codiac-entities/cluster-capture-def.d.ts +4 -2
- package/dist/command-base-enterprise.d.ts +2 -1
- package/dist/command-base-enterprise.js +10 -7
- package/dist/command-base-enterprise.js.map +1 -1
- package/dist/command-base-tenantless.d.ts +2 -1
- package/dist/command-base-tenantless.js +12 -10
- package/dist/command-base-tenantless.js.map +1 -1
- package/dist/commands/asset/create.d.ts +2 -8
- package/dist/commands/asset/create.js +24 -4
- package/dist/commands/asset/create.js.map +1 -1
- package/dist/commands/asset/deploy.d.ts +8 -4
- package/dist/commands/asset/deploy.js +58 -29
- package/dist/commands/asset/deploy.js.map +1 -1
- package/dist/commands/asset/entrypoint/delete.js +3 -3
- package/dist/commands/asset/entrypoint/delete.js.map +1 -1
- package/dist/commands/asset/entrypoint/set.js +3 -3
- package/dist/commands/asset/entrypoint/set.js.map +1 -1
- package/dist/commands/asset/list.d.ts +2 -0
- package/dist/commands/asset/list.js +4 -0
- package/dist/commands/asset/list.js.map +1 -1
- package/dist/commands/asset/view.d.ts +4 -4
- package/dist/commands/asset/view.js +3 -2
- package/dist/commands/asset/view.js.map +1 -1
- package/dist/commands/cabinet/create.d.ts +2 -1
- package/dist/commands/cabinet/create.js +15 -2
- package/dist/commands/cabinet/create.js.map +1 -1
- package/dist/commands/cabinet/obliterate.d.ts +3 -1
- package/dist/commands/cabinet/obliterate.js +6 -2
- package/dist/commands/cabinet/obliterate.js.map +1 -1
- package/dist/commands/cluster/start.d.ts +37 -0
- package/dist/commands/cluster/start.js +191 -0
- package/dist/commands/cluster/start.js.map +1 -0
- package/dist/commands/cluster/stop.d.ts +36 -0
- package/dist/commands/cluster/stop.js +190 -0
- package/dist/commands/cluster/stop.js.map +1 -0
- package/dist/commands/config/add.d.ts +3 -2
- package/dist/commands/config/add.js +8 -25
- package/dist/commands/config/add.js.map +1 -1
- package/dist/commands/config/delete.js +7 -4
- package/dist/commands/config/delete.js.map +1 -1
- package/dist/commands/config/settings/get.js +7 -4
- package/dist/commands/config/settings/get.js.map +1 -1
- package/dist/commands/config/view.d.ts +0 -1
- package/dist/commands/config/view.js +5 -39
- package/dist/commands/config/view.js.map +1 -1
- package/dist/commands/environment/cluster/attach.js +15 -4
- package/dist/commands/environment/cluster/attach.js.map +1 -1
- package/dist/commands/environment/cluster/detach.js +6 -1
- package/dist/commands/environment/cluster/detach.js.map +1 -1
- package/dist/commands/environment/create.d.ts +1 -0
- package/dist/commands/environment/create.js +22 -3
- package/dist/commands/environment/create.js.map +1 -1
- package/dist/commands/environment/list.d.ts +3 -0
- package/dist/commands/environment/list.js +20 -7
- package/dist/commands/environment/list.js.map +1 -1
- package/dist/commands/filestore/capture.js.map +1 -1
- package/dist/commands/imageRegistry/capture.js +4 -0
- package/dist/commands/imageRegistry/capture.js.map +1 -1
- package/dist/commands/imageRegistry/list.d.ts +29 -0
- package/dist/commands/imageRegistry/list.js +108 -0
- package/dist/commands/imageRegistry/list.js.map +1 -0
- package/dist/commands/init.js +4 -4
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/noc/cluster/capture.d.ts +0 -2
- package/dist/commands/noc/cluster/capture.js +19 -15
- package/dist/commands/noc/cluster/capture.js.map +1 -1
- package/dist/commands/noc/cluster/create.d.ts +20 -0
- package/dist/commands/noc/cluster/create.js +244 -17
- package/dist/commands/noc/cluster/create.js.map +1 -1
- package/dist/commands/noc/cluster/destroy.d.ts +4 -0
- package/dist/commands/noc/cluster/destroy.js +38 -9
- package/dist/commands/noc/cluster/destroy.js.map +1 -1
- package/dist/commands/noc/cluster/forget.d.ts +2 -1
- package/dist/commands/noc/cluster/forget.js +20 -3
- package/dist/commands/noc/cluster/forget.js.map +1 -1
- package/dist/commands/noc/cluster/init.d.ts +1 -0
- package/dist/commands/noc/cluster/init.js +10 -3
- package/dist/commands/noc/cluster/init.js.map +1 -1
- package/dist/commands/noc/cluster/list.js +6 -2
- package/dist/commands/noc/cluster/list.js.map +1 -1
- package/dist/message-contracts/terminal-command-request.d.ts +66 -0
- package/dist/message-contracts/terminal-command-request.js +13 -0
- package/dist/message-contracts/terminal-command-request.js.map +1 -0
- package/dist/ops/LocalOps.d.ts +1 -1
- package/dist/ops/LocalOps.js +4 -4
- package/dist/ops/LocalOps.js.map +1 -1
- package/dist/ops/entities/cli-config.d.ts +2 -1
- package/dist/ops/entities/cli-config.js +3 -2
- package/dist/ops/entities/cli-config.js.map +1 -1
- package/dist/ops/index.d.ts +0 -3
- package/dist/ops/index.js +3 -3
- package/dist/ops/index.js.map +1 -1
- package/dist/ops/k8s/k8s-utils.js.map +1 -1
- package/dist/ops/scaffolding/base-scaffolding.d.ts +1 -1
- package/dist/ops/scaffolding/base-scaffolding.js +2 -1
- package/dist/ops/scaffolding/base-scaffolding.js.map +1 -1
- package/dist/ops/scaffolding/codiac-api-scaffolding.js.map +1 -1
- package/dist/ops/scaffolding/typescript-scaffolding.d.ts +2 -1
- package/dist/ops/scaffolding/typescript-scaffolding.js +2 -1
- package/dist/ops/scaffolding/typescript-scaffolding.js.map +1 -1
- package/dist/ops/terminal-command-runner/local-command-runner.d.ts +41 -0
- package/dist/ops/terminal-command-runner/local-command-runner.js +146 -0
- package/dist/ops/terminal-command-runner/local-command-runner.js.map +1 -0
- package/dist/ops/terminal-utils.d.ts +56 -0
- package/dist/ops/terminal-utils.js +721 -0
- package/dist/ops/terminal-utils.js.map +1 -0
- package/dist/relay/relay-container.js +4 -1
- package/dist/relay/relay-container.js.map +1 -1
- package/dist/relay/wsclient/relay-websocket-client.d.ts +3 -0
- package/dist/relay/wsclient/relay-websocket-client.js +9 -0
- package/dist/relay/wsclient/relay-websocket-client.js.map +1 -1
- package/dist/sdk/codiac-sdk-for-cli.d.ts +29 -0
- package/dist/sdk/codiac-sdk-for-cli.js +83 -0
- package/dist/sdk/codiac-sdk-for-cli.js.map +1 -0
- package/dist/{uilogic → sdk}/i-cluster-configurator.d.ts +2 -1
- package/dist/sdk/i-cluster-configurator.js.map +1 -0
- package/dist/sdk/i-file-store-configurator.js.map +1 -0
- package/dist/{uilogic → sdk}/i-login-configurator.d.ts +10 -3
- package/dist/sdk/i-login-configurator.js.map +1 -0
- package/dist/sdk/i-registry-configurator.js.map +1 -0
- package/dist/sdk/i-secret-store-configurator.js.map +1 -0
- package/dist/sdk/index.d.ts +7 -0
- package/dist/sdk/index.js +11 -0
- package/dist/sdk/index.js.map +1 -0
- package/dist/sdk-adapters/artifact-hub/artifact-hub-cli-adapter.d.ts +6 -0
- package/dist/sdk-adapters/artifact-hub/artifact-hub-cli-adapter.js +16 -0
- package/dist/sdk-adapters/artifact-hub/artifact-hub-cli-adapter.js.map +1 -0
- package/dist/{uilogic/cloud-resource-configurators → sdk-adapters/artifact-hub}/helm-resource-configurator.d.ts +4 -4
- package/dist/{uilogic/cloud-resource-configurators → sdk-adapters/artifact-hub}/helm-resource-configurator.js +5 -1
- package/dist/sdk-adapters/artifact-hub/helm-resource-configurator.js.map +1 -0
- package/dist/sdk-adapters/artifact-hub/index.d.ts +2 -0
- package/dist/sdk-adapters/artifact-hub/index.js +6 -0
- package/dist/sdk-adapters/artifact-hub/index.js.map +1 -0
- package/dist/sdk-adapters/aws/aws-cli-adapter.d.ts +6 -0
- package/dist/sdk-adapters/aws/aws-cli-adapter.js +20 -0
- package/dist/sdk-adapters/aws/aws-cli-adapter.js.map +1 -0
- package/dist/{uilogic/cloud-resource-configurators → sdk-adapters/aws}/aws-resource-configurator.d.ts +6 -9
- package/dist/{uilogic/cloud-resource-configurators → sdk-adapters/aws}/aws-resource-configurator.js +20 -10
- package/dist/sdk-adapters/aws/aws-resource-configurator.js.map +1 -0
- package/dist/sdk-adapters/aws/index.d.ts +2 -0
- package/dist/sdk-adapters/aws/index.js +6 -0
- package/dist/sdk-adapters/aws/index.js.map +1 -0
- package/dist/{uilogic/cloud-resource-configurators → sdk-adapters/azure}/az-interactive-login-configurator.d.ts +6 -7
- package/dist/{uilogic/cloud-resource-configurators → sdk-adapters/azure}/az-interactive-login-configurator.js +7 -8
- package/dist/sdk-adapters/azure/az-interactive-login-configurator.js.map +1 -0
- package/dist/sdk-adapters/azure/azure-cli-adapter.d.ts +6 -0
- package/dist/sdk-adapters/azure/azure-cli-adapter.js +20 -0
- package/dist/sdk-adapters/azure/azure-cli-adapter.js.map +1 -0
- package/dist/{uilogic/cloud-resource-configurators → sdk-adapters/azure}/azure-resource-configurator.d.ts +4 -13
- package/dist/{uilogic/cloud-resource-configurators → sdk-adapters/azure}/azure-resource-configurator.js +33 -38
- package/dist/sdk-adapters/azure/azure-resource-configurator.js.map +1 -0
- package/dist/sdk-adapters/azure/index.d.ts +3 -0
- package/dist/sdk-adapters/azure/index.js +7 -0
- package/dist/sdk-adapters/azure/index.js.map +1 -0
- package/dist/sdk-adapters/docker-hub/docker-hub-cli-adapter.d.ts +6 -0
- package/dist/sdk-adapters/docker-hub/docker-hub-cli-adapter.js +16 -0
- package/dist/sdk-adapters/docker-hub/docker-hub-cli-adapter.js.map +1 -0
- package/dist/{uilogic/cloud-resource-configurators → sdk-adapters/docker-hub}/docker-hub-resource-configurator.d.ts +4 -4
- package/dist/{uilogic/cloud-resource-configurators → sdk-adapters/docker-hub}/docker-hub-resource-configurator.js +7 -1
- package/dist/sdk-adapters/docker-hub/docker-hub-resource-configurator.js.map +1 -0
- package/dist/sdk-adapters/docker-hub/index.d.ts +2 -0
- package/dist/sdk-adapters/docker-hub/index.js +6 -0
- package/dist/sdk-adapters/docker-hub/index.js.map +1 -0
- package/dist/sdk-adapters/local-machine/index.js +4 -0
- package/dist/sdk-adapters/local-machine/index.js.map +1 -0
- package/dist/sdk-adapters/local-machine/local-machine-cli-adapter.js +14 -0
- package/dist/sdk-adapters/local-machine/local-machine-cli-adapter.js.map +1 -0
- package/dist/sdk-adapters/local-machine/local-machine-login-configurator.d.ts +17 -0
- package/dist/sdk-adapters/local-machine/local-machine-login-configurator.js +66 -0
- package/dist/sdk-adapters/local-machine/local-machine-login-configurator.js.map +1 -0
- package/dist/sdk-adapters/local-machine/local-machine-resource-configurator.d.ts +21 -0
- package/dist/sdk-adapters/local-machine/local-machine-resource-configurator.js +126 -0
- package/dist/sdk-adapters/local-machine/local-machine-resource-configurator.js.map +1 -0
- package/dist/sdk-adapters/shared/resource-configurator-base.d.ts +31 -0
- package/dist/sdk-adapters/shared/resource-configurator-base.js +124 -0
- package/dist/sdk-adapters/shared/resource-configurator-base.js.map +1 -0
- package/dist/uilogic/build-configurator.d.ts +2 -1
- package/dist/uilogic/build-configurator.js.map +1 -1
- package/dist/uilogic/cloud-provider-contextualizer.d.ts +4 -4
- package/dist/uilogic/cloud-provider-contextualizer.js +24 -9
- package/dist/uilogic/cloud-provider-contextualizer.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurator-factory.d.ts +6 -10
- package/dist/uilogic/cloud-resource-configurator-factory.js +31 -19
- package/dist/uilogic/cloud-resource-configurator-factory.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/asset-configurator.d.ts +8 -1
- package/dist/uilogic/cloud-resource-configurators/asset-configurator.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/unsupported-resource-configurator.d.ts +1 -1
- package/dist/uilogic/config-ui-utils.d.ts +19 -14
- package/dist/uilogic/config-ui-utils.js +66 -21
- package/dist/uilogic/config-ui-utils.js.map +1 -1
- package/dist/uilogic/enterprise-contextualizer.d.ts +2 -1
- package/dist/uilogic/enterprise-contextualizer.js.map +1 -1
- package/dist/uilogic/i-messaging-client.d.ts +1 -0
- package/dist/uilogic/image-registry-contextualizer.d.ts +3 -3
- package/dist/uilogic/image-registry-contextualizer.js +4 -2
- package/dist/uilogic/image-registry-contextualizer.js.map +1 -1
- package/dist/uilogic/index.d.ts +0 -4
- package/dist/uilogic/index.js +0 -4
- package/dist/uilogic/index.js.map +1 -1
- package/dist/uilogic/lrp-watcher-predef.js +10 -4
- package/dist/uilogic/lrp-watcher-predef.js.map +1 -1
- package/dist/uilogic/rootmap-ui-utils.d.ts +2 -0
- package/dist/uilogic/rootmap-ui-utils.js +35 -11
- package/dist/uilogic/rootmap-ui-utils.js.map +1 -1
- package/dist/uilogic/tenant-contextualizer.d.ts +1 -1
- package/dist/uilogic/tenant-contextualizer.js.map +1 -1
- package/dist/uilogic/type-safety-utils.d.ts +11 -0
- package/dist/uilogic/type-safety-utils.js +13 -0
- package/dist/uilogic/type-safety-utils.js.map +1 -1
- package/dist/uilogic/validators/non-empty-validator.d.ts +7 -0
- package/dist/uilogic/validators/non-empty-validator.js +20 -0
- package/dist/uilogic/validators/non-empty-validator.js.map +1 -0
- package/dist/uilogic/validators/semver-range-validator.d.ts +1 -1
- package/dist/uilogic/validators/semver-range-validator.js +2 -2
- package/dist/uilogic/validators/semver-range-validator.js.map +1 -1
- package/oclif.manifest.json +250 -23
- package/package.json +4 -4
- package/dist/ops/azure-container-registry-client/azure-container-registry-client.js +0 -148
- package/dist/ops/azure-container-registry-client/azure-container-registry-client.js.map +0 -1
- package/dist/uilogic/cloud-resource-configurators/aws-resource-configurator.js.map +0 -1
- package/dist/uilogic/cloud-resource-configurators/az-interactive-login-configurator.js.map +0 -1
- package/dist/uilogic/cloud-resource-configurators/azure-resource-configurator.js.map +0 -1
- package/dist/uilogic/cloud-resource-configurators/azure-types.js +0 -10
- package/dist/uilogic/cloud-resource-configurators/azure-types.js.map +0 -1
- package/dist/uilogic/cloud-resource-configurators/docker-hub-resource-configurator.js.map +0 -1
- package/dist/uilogic/cloud-resource-configurators/helm-resource-configurator.js.map +0 -1
- package/dist/uilogic/i-cluster-configurator.js.map +0 -1
- package/dist/uilogic/i-file-store-configurator.js.map +0 -1
- package/dist/uilogic/i-login-configurator.js.map +0 -1
- package/dist/uilogic/i-registry-configurator.js.map +0 -1
- package/dist/uilogic/i-secret-store-configurator.js.map +0 -1
- /package/dist/{uilogic → sdk}/i-cluster-configurator.js +0 -0
- /package/dist/{uilogic → sdk}/i-file-store-configurator.d.ts +0 -0
- /package/dist/{uilogic → sdk}/i-file-store-configurator.js +0 -0
- /package/dist/{uilogic → sdk}/i-login-configurator.js +0 -0
- /package/dist/{uilogic → sdk}/i-registry-configurator.d.ts +0 -0
- /package/dist/{uilogic → sdk}/i-registry-configurator.js +0 -0
- /package/dist/{uilogic → sdk}/i-secret-store-configurator.d.ts +0 -0
- /package/dist/{uilogic → sdk}/i-secret-store-configurator.js +0 -0
- /package/dist/{ops/azure-container-registry-client/azure-container-registry-client.d.ts → sdk-adapters/local-machine/index.d.ts} +0 -0
- /package/dist/{uilogic/cloud-resource-configurators/azure-types.d.ts → sdk-adapters/local-machine/local-machine-cli-adapter.d.ts} +0 -0
|
@@ -4,12 +4,27 @@ 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 config_ui_utils_1 = require("../../../uilogic/config-ui-utils");
|
|
7
|
-
const cloud_provider_contextualizer_1 = require("../../../uilogic/cloud-provider-contextualizer");
|
|
8
7
|
const command_base_exec_tenant_1 = require("../../../command-base-exec-tenant");
|
|
8
|
+
const terminal_utils_1 = require("../../../ops/terminal-utils");
|
|
9
|
+
const local_command_runner_1 = require("../../../ops/terminal-command-runner/local-command-runner");
|
|
9
10
|
class NocClusterDestroy extends command_base_exec_tenant_1.CommandBaseExecTenant {
|
|
11
|
+
get termUtils() {
|
|
12
|
+
if (this._termUtils_backer === undefined) {
|
|
13
|
+
this._termUtils_backer = this.ioc.get(terminal_utils_1.TerminalUtils); // new TerminalUtils(this.logger);
|
|
14
|
+
}
|
|
15
|
+
return this._termUtils_backer;
|
|
16
|
+
}
|
|
17
|
+
get localCommandRunner() {
|
|
18
|
+
if (this._localCommandRunner_backer === undefined) {
|
|
19
|
+
this._localCommandRunner_backer = this.ioc.get(local_command_runner_1.LocalCommandRunner); // new LocalCommandRunner(this.msgClient, this.cliEnviro, this.termUtils, this.logger);
|
|
20
|
+
}
|
|
21
|
+
return this._localCommandRunner_backer;
|
|
22
|
+
}
|
|
10
23
|
bootstrap() {
|
|
11
24
|
super.bootstrap();
|
|
12
|
-
|
|
25
|
+
// CloudProviderContextualizer.bootstrap(this.ioc); // this cant be double-booptstrapped. Use the lazy property on CommandBaseEnterprise instead.
|
|
26
|
+
this.ioc.bind(terminal_utils_1.TerminalUtils).toDynamicValue(ctx => new terminal_utils_1.TerminalUtils(this.logger));
|
|
27
|
+
this.ioc.bind(local_command_runner_1.LocalCommandRunner).toDynamicValue(ctx => new local_command_runner_1.LocalCommandRunner(this.msgClient, this.cliEnviro, this.termUtils, this.logger));
|
|
13
28
|
}
|
|
14
29
|
captureArgs() {
|
|
15
30
|
var _a, _b, _c;
|
|
@@ -110,13 +125,27 @@ class NocClusterDestroy extends command_base_exec_tenant_1.CommandBaseExecTenant
|
|
|
110
125
|
}
|
|
111
126
|
executeTask(candidate) {
|
|
112
127
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
128
|
+
try {
|
|
129
|
+
if (candidate.provider == codiac_domain_1.CloudProviderEnum.localMachine) {
|
|
130
|
+
let socketId = yield this.msgClient.connect();
|
|
131
|
+
this.localCommandRunner.listen(); // to fire off any local machine terminal commands requested by the relay during the cluster create
|
|
132
|
+
}
|
|
133
|
+
yield this.cspContextualizer.promptForCloudProviderCreds(this.ioc, candidate.provider, undefined, undefined, undefined, candidate.providerSubscription);
|
|
134
|
+
this._ui.startSpinner(`Destroying physical cluster instance: ${this._styler.hilite(candidate.name)}...`);
|
|
135
|
+
const result = yield this.genRelayClient.Call.postExecuteDeleteClusterInstance({ name: candidate.name, deleteIdentity: candidate.deleteIdentity });
|
|
136
|
+
this._ui.stopSpinner(result.success ? "SUCCESS" : "FAILED");
|
|
137
|
+
const msg = `Cluster destroy ${result.success ? this._styler.colorGood("SUCCESS") : this._styler.colorCritical("FAILED")}: ${result.message || ""}`;
|
|
138
|
+
this.logger.debug(msg, result);
|
|
139
|
+
this._ui.userMessage(msg);
|
|
140
|
+
}
|
|
141
|
+
catch (err) {
|
|
142
|
+
throw err;
|
|
143
|
+
}
|
|
144
|
+
finally {
|
|
145
|
+
if (this.msgClient.isConnected()) {
|
|
146
|
+
yield this.msgClient.disconnect();
|
|
147
|
+
}
|
|
148
|
+
}
|
|
120
149
|
});
|
|
121
150
|
}
|
|
122
151
|
describe(cluster) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/destroy.ts"],"names":[],"mappings":";;;AAAA,sCAA0C;AAC1C,4DAA6D;AAG7D,sEAAoE;
|
|
1
|
+
{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/destroy.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,9 @@ import { Command } from '@oclif/core';
|
|
|
2
2
|
import { ClusterDef, RootMap } from '../../../apis/codiac-api/contracts';
|
|
3
3
|
import { CommandBaseExecTenant } from '../../../command-base-exec-tenant';
|
|
4
4
|
import { InteractionModes } from '../../../uilogic/config-ui-utils';
|
|
5
|
-
interface ClusterForgetSpec extends Pick<ClusterDef, "name" | "provider" | "id"> {
|
|
5
|
+
interface ClusterForgetSpec extends Pick<ClusterDef, "name" | "provider" | "thisMachine" | "id"> {
|
|
6
6
|
running: boolean;
|
|
7
|
+
thisMachine?: boolean | undefined;
|
|
7
8
|
}
|
|
8
9
|
export default class NocClusterForget extends CommandBaseExecTenant<ClusterForgetSpec> {
|
|
9
10
|
static description: string;
|
|
@@ -39,6 +39,8 @@ class NocClusterForget extends command_base_exec_tenant_1.CommandBaseExecTenant
|
|
|
39
39
|
name: cluster.name,
|
|
40
40
|
provider: cluster.provider
|
|
41
41
|
};
|
|
42
|
+
if (cluster.thisMachine != undefined)
|
|
43
|
+
candidate.thisMachine = cluster.thisMachine;
|
|
42
44
|
}
|
|
43
45
|
return candidate;
|
|
44
46
|
});
|
|
@@ -53,6 +55,8 @@ class NocClusterForget extends command_base_exec_tenant_1.CommandBaseExecTenant
|
|
|
53
55
|
name: cluster.name,
|
|
54
56
|
provider: cluster.provider
|
|
55
57
|
};
|
|
58
|
+
if (cluster.thisMachine != undefined)
|
|
59
|
+
candidate.thisMachine = cluster.thisMachine;
|
|
56
60
|
}
|
|
57
61
|
return candidate;
|
|
58
62
|
});
|
|
@@ -66,11 +70,24 @@ class NocClusterForget extends command_base_exec_tenant_1.CommandBaseExecTenant
|
|
|
66
70
|
return cmd;
|
|
67
71
|
}
|
|
68
72
|
executeTask(candidate) {
|
|
73
|
+
var _a;
|
|
69
74
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
70
75
|
this._ui.startSpinner(`Forgetting ${candidate.provider} cluster: ${this._styler.hilite(candidate.name)}...`);
|
|
71
|
-
let
|
|
76
|
+
let req = { id: candidate.id };
|
|
77
|
+
if (candidate.thisMachine == true)
|
|
78
|
+
req.thisMachine = true;
|
|
79
|
+
let result = yield this._codiacApi.ClusterDef.tryDelete(req, {});
|
|
72
80
|
this._ui.stopSpinner(result.success ? "SUCCESS" : "FAILED");
|
|
73
|
-
let msg
|
|
81
|
+
let msg;
|
|
82
|
+
if (result.success) {
|
|
83
|
+
msg = this._styler.colorGood("SUCCESS").concat(": Codiac record of ", candidate.provider, " cluster [", this._styler.hilite(candidate.name), "] was successfully forgotten.");
|
|
84
|
+
if (result.message)
|
|
85
|
+
msg = msg.concat(" ", result.message);
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
msg = this._styler.colorCritical("FAILED").concat(": Failed removing Codiac record of ", candidate.provider, " cluster [", this._styler.hilite(candidate.name), "]");
|
|
89
|
+
msg = _.isEmpty(result.message) ? msg.concat(".") : msg.concat(": ", (_a = result.message) !== null && _a !== void 0 ? _a : "");
|
|
90
|
+
}
|
|
74
91
|
this.logger.debug(msg, result);
|
|
75
92
|
this._ui.userMessage(msg);
|
|
76
93
|
});
|
|
@@ -89,7 +106,7 @@ class NocClusterForget extends command_base_exec_tenant_1.CommandBaseExecTenant
|
|
|
89
106
|
// this.logger.trace("rootmap", rootMap);
|
|
90
107
|
// Get the list of clusters
|
|
91
108
|
let cluster;
|
|
92
|
-
let readResult = yield this._codiacApi.ClusterDef.tryReadMany({ all: true }, { projection: { pathsIncluded: ["id", "name", "provider", "locationName", "instance", "modified", "modifiedBy"], pathsExcluded: [] } });
|
|
109
|
+
let readResult = yield this._codiacApi.ClusterDef.tryReadMany({ all: true }, { projection: { pathsIncluded: ["id", "name", "provider", "thisMachine", "locationName", "instance", "modified", "modifiedBy"], pathsExcluded: [] } });
|
|
93
110
|
let clusterDefs = (_b = readResult.output) !== null && _b !== void 0 ? _b : [];
|
|
94
111
|
clusterDefs = _.orderBy(clusterDefs, c => c.name);
|
|
95
112
|
if (provider) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forget.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/forget.ts"],"names":[],"mappings":";;;AAAA,4BAA6B;AAC7B,sCAA4C;AAE5C,
|
|
1
|
+
{"version":3,"file":"forget.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/forget.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export default class NocClusterInit extends CommandBaseEnterprise {
|
|
|
6
6
|
help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
|
|
7
7
|
name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
8
8
|
provider: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
9
|
+
adjust: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
9
10
|
silent: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
10
11
|
};
|
|
11
12
|
static args: {
|
|
@@ -5,6 +5,7 @@ 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
7
|
const ops_1 = require("../../../ops");
|
|
8
|
+
const _ = require("lodash");
|
|
8
9
|
class NocClusterInit extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
9
10
|
run() {
|
|
10
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -20,10 +21,11 @@ class NocClusterInit extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
20
21
|
this.__ui = new ops_1.ThrowingUserInputProvider(this.logger);
|
|
21
22
|
this._userCntx = yield this.establishTenantContext(this._userCntx);
|
|
22
23
|
let provider = (flags.provider) ? codiac_domain_1.CloudProviderEnum[flags.provider] : undefined;
|
|
24
|
+
let adjust = (flags.adjust != undefined) ? flags.adjust : undefined;
|
|
23
25
|
let cluster;
|
|
24
26
|
let crit = { privateOwner: (_b = this._userCntx) === null || _b === void 0 ? void 0 : _b.currentTenantCode };
|
|
25
27
|
// Ensure that the type alias matches the projection...
|
|
26
|
-
let projection = { pathsIncluded: ["id", "name", "provider", "providerSubscription", "locationName", "privateOwner", "instance"], pathsExcluded: [] };
|
|
28
|
+
let projection = { pathsIncluded: ["id", "name", "provider", "providerSubscription", "locationName", "privateOwner", "instance", "ingressDef"], pathsExcluded: [] };
|
|
27
29
|
let readResult = yield this._codiacApi.ClusterDef.tryReadMany(crit, { projection: projection });
|
|
28
30
|
let clusterDefs = readResult.output ? readResult.output.map(c => c).filter(c => c.instance != undefined) : []; // we can only deinit clusters that have an instance
|
|
29
31
|
if (provider && Object.keys(codiac_domain_1.CloudProviderEnum).indexOf(provider) >= 0) {
|
|
@@ -61,9 +63,13 @@ class NocClusterInit extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
61
63
|
.map(c => { return { name: this.describe(c), value: c.name }; });
|
|
62
64
|
const name = (yield this._ui.promptSelect("clusterName", "Select the cluster to initialize:", choices));
|
|
63
65
|
let def = clusterDefs.find(c => c.name === name);
|
|
64
|
-
cluster = { name: name, provider: def
|
|
66
|
+
cluster = def; // { name: name, provider: def!.provider, providerSubscription: def!.providerSubscription };
|
|
65
67
|
}
|
|
66
68
|
}
|
|
69
|
+
if (cluster.ingressDef == undefined || _.isEmpty(cluster.ingressDef) || adjust == true) {
|
|
70
|
+
let regCfg = this.cspUiFactory.create(cluster.provider, this.ioc);
|
|
71
|
+
cluster.ingressDef = yield regCfg.promptForIngressSpec(cluster.ingressDef);
|
|
72
|
+
}
|
|
67
73
|
confirm = yield this._ui.promptConfirm("confirmInit", `Initialize the cluster: ${this._styler.hilite(this.describe(cluster))} ? `, false);
|
|
68
74
|
if (!confirm)
|
|
69
75
|
candidate = {}; // if cluster was set as a cmd flag, but they denied the confirm, this allows selecting a different one.
|
|
@@ -83,7 +89,7 @@ class NocClusterInit extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
83
89
|
// this.logger.debug(msg, resultIngress);
|
|
84
90
|
// this._ui.userMessage(msg);
|
|
85
91
|
// ASYNC STREAMING-STATUS MODE
|
|
86
|
-
let result = yield this.watcher.triggerAndWatch((socketId) => this.genRelayClient.Call.clusterInit({ spec: { clusterName: cluster.name }, socketId: socketId }) // Assertion ok - verified above
|
|
92
|
+
let result = yield this.watcher.triggerAndWatch((socketId) => this.genRelayClient.Call.clusterInit({ spec: { clusterName: cluster.name, ingressDef: cluster === null || cluster === void 0 ? void 0 : cluster.ingressDef }, socketId: socketId }) // Assertion ok - verified above
|
|
87
93
|
);
|
|
88
94
|
if (result.error) {
|
|
89
95
|
let msg = `Error initializing ${cluster.provider} cluster [${cluster.name}]: ${result.message} ${result.error.message || ""}`;
|
|
@@ -131,6 +137,7 @@ NocClusterInit.flags = {
|
|
|
131
137
|
help: core_1.Flags.help({ char: 'h' }),
|
|
132
138
|
name: core_1.Flags.string({ char: 'n', required: false, description: 'Name of the cluster.' }),
|
|
133
139
|
provider: core_1.Flags.string({ char: 'p', options: Object.keys(codiac_domain_1.CloudProviderEnum), required: false, description: 'Code for the cloud service provider.' }),
|
|
140
|
+
adjust: core_1.Flags.boolean({ required: false, description: `(Optional: defaults to false) Invoke interactive user-interface to make changes to the initialization specs.` }),
|
|
134
141
|
silent: core_1.Flags.boolean({ char: 'y', dependsOn: ["name"], required: false, description: `(Optional: defaults to false) Prevents interactive user-interface and throws if interaction is needed. Requires arguments: [--name -n]` })
|
|
135
142
|
};
|
|
136
143
|
NocClusterInit.args = {
|
|
@@ -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,sCAAyD;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/init.ts"],"names":[],"mappings":";;;AAAA,sCAA0C;AAE1C,4DAAqF;AAErF,8EAAyE;AACzE,sCAAyD;AACzD,4BAA6B;AAQ7B,MAAqB,cAAe,SAAQ,+CAAqB;IAiBvD,GAAG;;YACL,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,cAAc,CAAC,CAAC;oBACzD,MAAA,IAAI,CAAC,eAAe,0CAAE,MAAM,CACvB,SAAS,CAAC,GAAS,EAAE;;wBAClB,IAAI;4BACA,IAAI,KAAK,CAAC,MAAM;gCAAE,IAAI,CAAC,IAAI,GAAG,IAAI,+BAAyB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;4BACzE,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;4BAEnE,IAAI,QAAQ,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAO,iCAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;4BACvF,IAAI,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;4BAEpE,IAAI,OAAqC,CAAC;4BAC1C,IAAI,IAAI,GAAuB,EAAE,YAAY,EAAE,MAAA,IAAI,CAAC,SAAS,0CAAE,iBAAkB,EAAE,CAAC;4BAEpF,uDAAuD;4BACvD,IAAI,UAAU,GAAG,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,sBAAsB,EAAE,cAAc,EAAE,cAAc,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;4BAEpK,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;4BAEhG,IAAI,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAmB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAE,oDAAoD;4BACtL,IAAI,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,iCAAiB,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gCACnE,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC;6BACjE;4BACD,IAAI,OAAO,GAAG,KAAK,CAAC;4BACpB,IAAI,UAAU,CAAC,KAAK,KAAK,SAAS,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;gCAC5D,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,gDAAgD,CAAC,CAAC;6BAC1E;iCAAM,IAAI,KAAK,CAAC,MAAM,EAAE;gCACrB,MAAM,IAAI,GAAG,MAAA,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,0CAAE,oBAAoB,CAAC;gCACzG,OAAO,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,IAAK,EAAE,QAAQ,EAAqB,CAAC,QAAS,CAAC,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;6BACzG;iCAAM;gCAEH,IAAI,SAAS,GAA6F,EAAE,CAAC;gCAC7G,IAAI,KAAK,CAAC,IAAI;oCAAE,SAAS,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;gCAC5C,GAAG;oCACC,IAAI,UAAU,CAAC,KAAK,EAAE;wCAClB,8EAA8E;wCAC9E,wEAAwE;wCACxE,IAAI,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;wCAC1D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;wCACpF,MAAM,IAAI,GAAW,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,0CAA0C,EAAE,IAAI,CAAC,CAAC,CAAC;wCAC9G,MAAM,IAAI,GAAW,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,GAAG,IAAI,iCAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,kCAAkC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;wCAC9K,OAAO,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;qCACvE;yCAAM,EAAG,iFAAiF;wCACvF,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;wCAC5F,IAAI,KAAK,EAAE;4CACP,OAAO,GAAG,KAAK,CAAC;yCACnB;6CAAM;4CACH,IAAI,OAAO,GAAG,WAAW;iDACpB,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;4CACrE,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,aAAa,EAAE,mCAAmC,EAAE,OAAO,CAAC,CAAE,CAAC;4CACzG,IAAI,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;4CACjD,OAAO,GAAG,GAAI,CAAC,CAAC,4FAA4F;yCAC/G;qCACJ;oCAED,IAAI,OAAO,CAAC,UAAU,IAAI,SAAS,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,MAAM,IAAI,IAAI,EAAE;wCACpF,IAAI,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;wCAClE,OAAO,CAAC,UAAU,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;qCAC9E;oCAED,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,aAAa,EAAE,2BAA2B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oCAC1I,IAAI,CAAC,OAAO;wCAAE,SAAS,GAAG,EAAE,CAAC,CAAE,wGAAwG;iCAE1I,QAAQ,OAAO,KAAK,IAAI,EAAC;6BAC7B;4BAGD,IAAI,OAAO,EAAE;gCACT,IAAI,OAAO,IAAI,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE;oCACjC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;wCACf,MAAM,IAAI,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;qCACvJ;oCACD,wBAAwB;oCACxB,uFAAuF;oCACvF,iGAAiG;oCACjG,sEAAsE;oCACtE,GAAG;oCACH,sKAAsK;oCACtK,yCAAyC;oCACzC,6BAA6B;oCAE7B,8BAA8B;oCAC9B,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAC3C,CAAC,QAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,OAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAE,gCAAgC;qCAC9L,CAAC;oCAEF,IAAI,MAAM,CAAC,KAAK,EAAE;wCACd,IAAI,GAAG,GAAG,sBAAsB,OAAO,CAAC,QAAQ,aAAa,OAAO,CAAC,IAAI,MAAM,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;wCAC9H,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;wCACrC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;qCAC1E;yCAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;wCACxB,IAAI,GAAG,GAAG,qCAAqC,OAAO,CAAC,QAAQ,aAAa,OAAO,CAAC,IAAI,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;wCAC/G,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;wCAChC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;qCAC3E;yCAAM;wCACH,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,yBAAyB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,QAAQ,kBAAkB,OAAO,CAAC,oBAAoB,IAAI,CAAC;wCAClL,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;wCAChC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;qCAC7B;iCAIJ;qCAAM;oCACH,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,yCAAyC,CAAC,CAAC;iCACnE;6BACJ;4BAED,OAAO,EAAE,CAAC;yBACb;wBAAC,OAAO,GAAG,EAAE;4BACV,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;4BACtB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAE,sCAAsC;yBACvD;oBACL,CAAC,CAAA,CAAC,CAAC;iBACV;gBAAC,OAAO,GAAG,EAAE;oBACV,MAAM,CAAC,GAAG,CAAC,CAAC;iBACf;YACL,CAAC,CAAA,CAAC,CAAC;QACP,CAAC;KAAA;IAED,mDAAmD;IAC3C,QAAQ,CAAC,OAA6E;QAC1F,OAAO,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,QAAQ,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC;IAC3I,CAAC;;AA9IL,iCA+IC;AA9IU,0BAAW,GAAG,sFAAsF,CAAC;AACrG,sBAAO,GAAG,CAAC,cAAc,CAAC,CAAC;AAE3B,oBAAK,GAAG;IACX,IAAI,EAAE,YAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAC/B,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,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,8GAA8G,EAAE,CAAC;IACvK,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,wIAAwI,EAAE,CAAC;CACpO,CAAA;AAEM,mBAAI,GAAG;IACV,IAAI,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,yCAAyC,EAAE,CAAC;CAChF,CAAC"}
|
|
@@ -7,6 +7,8 @@ const command_base_enterprise_1 = require("../../../command-base-enterprise");
|
|
|
7
7
|
const _ = require("lodash");
|
|
8
8
|
const render = require("../../../uilogic/render-methods");
|
|
9
9
|
const render_methods_1 = require("../../../uilogic/render-methods");
|
|
10
|
+
const type_safety_utils_1 = require("../../../uilogic/type-safety-utils");
|
|
11
|
+
const codiac_constants_1 = require("../../../codiac-constants");
|
|
10
12
|
class NocClusterList extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
11
13
|
run() {
|
|
12
14
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -72,9 +74,11 @@ class NocClusterList extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
72
74
|
}
|
|
73
75
|
clusterToString(c) {
|
|
74
76
|
var _a;
|
|
75
|
-
|
|
77
|
+
const isLocal = type_safety_utils_1.TypeSafetyUtils.toBoolean(c.thisMachine);
|
|
78
|
+
let localIcon = isLocal ? codiac_constants_1.CliConstants.UTF8_LOCAL.concat(" ") : undefined;
|
|
79
|
+
let dim1 = isLocal ? `(${c.provider})` : `(${c.provider}, ${c.locationName})`;
|
|
76
80
|
let dim2 = ` (${new Date((_a = c.modified) !== null && _a !== void 0 ? _a : "").toLocaleDateString()}, by ${c.modifiedBy})`;
|
|
77
|
-
return `${this._styler.hilite(c.name)} ${this._styler.dim(dim1)} ${this._styler.dim(dim2)}`;
|
|
81
|
+
return `${this._styler.hilite(c.name)} ${localIcon !== null && localIcon !== void 0 ? localIcon : ""}${this._styler.dim(dim1)} ${this._styler.dim(dim2)}`;
|
|
78
82
|
}
|
|
79
83
|
}
|
|
80
84
|
exports.default = NocClusterList;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/list.ts"],"names":[],"mappings":";;;AAAA,sCAAmC;AACnC,6BAA6B;AAE7B,8EAAyE;AACzE,4BAA6B;AAC7B,0DAA0D;AAC1D,oEAAoE;
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
export declare enum CommandOutputModeEnum {
|
|
2
|
+
/** Instructs the executor to capture the entire stdout stream as a string and return it with the command response. */
|
|
3
|
+
"capture" = "capture",
|
|
4
|
+
/** Instructs the executor to stream stdout to a log without returning it in the response (similar to a void response type).
|
|
5
|
+
* NOTE: This mode only affects the visibility of stdout, it does NOT prevent visibility of errors.
|
|
6
|
+
*/
|
|
7
|
+
"log" = "log"
|
|
8
|
+
}
|
|
9
|
+
export interface TerminalCommandRequest extends Partial<ShellSpec> {
|
|
10
|
+
command: string;
|
|
11
|
+
/** Declares whether to stream output to a log or to cpature and return it with the command result. */
|
|
12
|
+
outputMode: CommandOutputModeEnum;
|
|
13
|
+
cwd?: string | undefined;
|
|
14
|
+
}
|
|
15
|
+
export interface ShellSpec {
|
|
16
|
+
/** Command to invoke a specific terminal from which to execute given commands.
|
|
17
|
+
* Setting this argument will invoke a 3-step process to open a terminal, then fire the command from that terminal, and then finally close the terminal.
|
|
18
|
+
*
|
|
19
|
+
* If you want to run the command from a shell in a single step (aka: inline shell command),
|
|
20
|
+
* ignore this property and construct the shell inline syntax into the main command string.
|
|
21
|
+
* eg:
|
|
22
|
+
* ```
|
|
23
|
+
* const req = { command: "powershell -c 'wsl -l -v'" }
|
|
24
|
+
* ```
|
|
25
|
+
*/
|
|
26
|
+
shellExe: string | undefined;
|
|
27
|
+
/** Arguments for the terminal command. */
|
|
28
|
+
shellArgs?: string[] | undefined;
|
|
29
|
+
env?: {
|
|
30
|
+
[key: string]: string;
|
|
31
|
+
} | undefined;
|
|
32
|
+
/** Declares that the command is to be run inline with the shell command as a single execution.
|
|
33
|
+
* Leave this parameter out if you want to run the command as a separate statement within the shell after the shell is instantiated.
|
|
34
|
+
*
|
|
35
|
+
* When set, the value of this property must be the name of the shell argument declaring the main command to run within the shell.
|
|
36
|
+
*
|
|
37
|
+
* There are typically two conventional arguments for this purpose:
|
|
38
|
+
* `--` (double-dash) or `-c` (command arg) (sometimes `-e`).
|
|
39
|
+
* When specified with a double-dash (`--`), the inline command is to be appended at the end of the whole shell command string, unescaped, as-is.
|
|
40
|
+
* When specified with a command arg (`-c` or `-e`), the inline command needs to be enclosed in double quotes (aka: "enquoted") with its content escaped appropriately.
|
|
41
|
+
*
|
|
42
|
+
* Niether of these two syntaxes support piping within the command.
|
|
43
|
+
* To utilize pipe operators within your command, ignore this property to avoid the inline syntax.
|
|
44
|
+
*
|
|
45
|
+
* For Example: the following shell spec and command...
|
|
46
|
+
* ```
|
|
47
|
+
* const shellSpec = { shellExe: "powershell", shellArgs: undefined, inlineOperator: "-c" };
|
|
48
|
+
* const command = "wsl -l -v"
|
|
49
|
+
* ```
|
|
50
|
+
* ...will yield the following command string:
|
|
51
|
+
* ```
|
|
52
|
+
* powershell -c 'wsl -l -v'
|
|
53
|
+
* ```
|
|
54
|
+
*/
|
|
55
|
+
inlineOperator?: "--" | "-c" | string | undefined;
|
|
56
|
+
}
|
|
57
|
+
/** Return value of a cli command execution. */
|
|
58
|
+
export interface CommandResponse extends CommandResponseVoid {
|
|
59
|
+
stdout: string | undefined;
|
|
60
|
+
}
|
|
61
|
+
/** Return value of a cli command execution. */
|
|
62
|
+
export interface CommandResponseVoid {
|
|
63
|
+
code: number;
|
|
64
|
+
stderr?: string | undefined;
|
|
65
|
+
error?: Error | undefined;
|
|
66
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CommandOutputModeEnum = void 0;
|
|
4
|
+
var CommandOutputModeEnum;
|
|
5
|
+
(function (CommandOutputModeEnum) {
|
|
6
|
+
/** Instructs the executor to capture the entire stdout stream as a string and return it with the command response. */
|
|
7
|
+
CommandOutputModeEnum["capture"] = "capture";
|
|
8
|
+
/** Instructs the executor to stream stdout to a log without returning it in the response (similar to a void response type).
|
|
9
|
+
* NOTE: This mode only affects the visibility of stdout, it does NOT prevent visibility of errors.
|
|
10
|
+
*/
|
|
11
|
+
CommandOutputModeEnum["log"] = "log";
|
|
12
|
+
})(CommandOutputModeEnum = exports.CommandOutputModeEnum || (exports.CommandOutputModeEnum = {}));
|
|
13
|
+
//# sourceMappingURL=terminal-command-request.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"terminal-command-request.js","sourceRoot":"","sources":["../../src/message-contracts/terminal-command-request.ts"],"names":[],"mappings":";;;AAEA,IAAY,qBAOX;AAPD,WAAY,qBAAqB;IAC/B,uHAAuH;IACvH,4CAAqB,CAAA;IACrB;;MAEE;IACF,oCAAa,CAAA;AACf,CAAC,EAPW,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAOhC"}
|
package/dist/ops/LocalOps.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { IdentitySet, TokenizedIdentity, ProjectUserConfig } from '@codiac.io/co
|
|
|
4
4
|
import { ProjectConfig, Submodule, ImageExport, PackageExport, RegistryTarget, PublishingMode } from '@codiac.io/codiac-relay-contracts';
|
|
5
5
|
import { Branch } from './entities/branch';
|
|
6
6
|
import { ImageBuildContext } from './entities/ImageBuildContext';
|
|
7
|
-
import { CliEnviro } from "
|
|
7
|
+
import { CliEnviro } from "./entities";
|
|
8
8
|
import { WorkspaceVersioner } from "./workspace-versioner";
|
|
9
9
|
export declare class LocalOps {
|
|
10
10
|
private ioc;
|
package/dist/ops/LocalOps.js
CHANGED
|
@@ -25,7 +25,7 @@ const branch_1 = require("./entities/branch");
|
|
|
25
25
|
const cli_context_repo_1 = require("./data/cli-context-repo");
|
|
26
26
|
const npm_config_repo_1 = require("./data/npm-config-repo");
|
|
27
27
|
const dx_constants_1 = require("./dx-constants");
|
|
28
|
-
const
|
|
28
|
+
const entities_1 = require("./entities");
|
|
29
29
|
const workspace_versioner_1 = require("./workspace-versioner");
|
|
30
30
|
const INTERFACES_CLI_1 = require("./INTERFACES_CLI");
|
|
31
31
|
const ops_constants_1 = require("./ops-constants");
|
|
@@ -64,13 +64,13 @@ let LocalOps = class LocalOps {
|
|
|
64
64
|
}
|
|
65
65
|
get cliEnviro() {
|
|
66
66
|
if (this._cliEnviro === undefined) {
|
|
67
|
-
this._cliEnviro = this.ioc.get(
|
|
67
|
+
this._cliEnviro = this.ioc.get(entities_1.CliEnviro);
|
|
68
68
|
}
|
|
69
69
|
return this._cliEnviro;
|
|
70
70
|
}
|
|
71
71
|
get projEnviro() {
|
|
72
72
|
if (this._projEnviro === undefined) {
|
|
73
|
-
this._projEnviro = this.ioc.get(
|
|
73
|
+
this._projEnviro = this.ioc.get(entities_1.ProjectEnviro);
|
|
74
74
|
}
|
|
75
75
|
return this._projEnviro;
|
|
76
76
|
}
|
|
@@ -94,7 +94,7 @@ let LocalOps = class LocalOps {
|
|
|
94
94
|
}
|
|
95
95
|
get cliConfig() {
|
|
96
96
|
if (this.__cliConfig === undefined) {
|
|
97
|
-
this.__cliConfig = this.ioc.get(
|
|
97
|
+
this.__cliConfig = this.ioc.get(entities_1.CliConfig);
|
|
98
98
|
}
|
|
99
99
|
return this.__cliConfig;
|
|
100
100
|
}
|