@codiac.io/codiac-cli 1.3.181 → 1.3.183
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/client.d.ts +5 -1
- package/dist/apis/codiac-api/gen/client.js +12 -0
- package/dist/apis/codiac-api/gen/client.js.map +1 -1
- package/dist/apis/codiac-api/gen/contracts/types.gen.d.ts +25 -0
- package/dist/apis/codiac-api/gen/contracts/types.gen.js.map +1 -1
- package/dist/apis/codiac-api/i-client.d.ts +4 -0
- package/dist/apis/codiac-api-nats/gen/client.d.ts +4 -0
- package/dist/apis/codiac-api-nats/gen/client.js +17 -1
- package/dist/apis/codiac-api-nats/gen/client.js.map +1 -1
- package/dist/apis/codiac-api-nats/gen/contracts/types.gen.d.ts +25 -0
- package/dist/apis/codiac-api-nats/gen/contracts/types.gen.js.map +1 -1
- package/dist/apis/codiac-relay/gen/client.d.ts +16 -3
- package/dist/apis/codiac-relay/gen/client.js +58 -1
- package/dist/apis/codiac-relay/gen/client.js.map +1 -1
- package/dist/apis/codiac-relay/gen/contracts/types.gen.d.ts +173 -7
- package/dist/apis/codiac-relay/gen/contracts/types.gen.js.map +1 -1
- package/dist/apis/codiac-relay/i-client.d.ts +8 -0
- package/dist/apis/codiac-relay-nats/gen/client.d.ts +15 -7
- package/dist/apis/codiac-relay-nats/gen/client.js +86 -19
- package/dist/apis/codiac-relay-nats/gen/client.js.map +1 -1
- package/dist/apis/codiac-relay-nats/gen/contracts/types.gen.d.ts +151 -15
- package/dist/apis/codiac-relay-nats/gen/contracts/types.gen.js +4 -4
- 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 +6 -0
- package/dist/apis/codiac-relay-nats/gen/contracts.ng.js +1 -0
- package/dist/apis/codiac-relay-nats/gen/contracts.ng.js.map +1 -1
- package/dist/bootstrapper-for-api-clients.js +14 -2
- package/dist/bootstrapper-for-api-clients.js.map +1 -1
- package/dist/cli-common/built-in-cli-user-input.d.ts +2 -1
- package/dist/cli-common/built-in-cli-user-input.js +52 -1
- package/dist/cli-common/built-in-cli-user-input.js.map +1 -1
- package/dist/cli-common/entities/prompt-choice.d.ts +2 -7
- package/dist/cli-common/mock-ui.d.ts +2 -1
- package/dist/cli-common/mock-ui.js +3 -0
- package/dist/cli-common/mock-ui.js.map +1 -1
- package/dist/codiac-constants.d.ts +3 -0
- package/dist/codiac-constants.js +3 -0
- package/dist/codiac-constants.js.map +1 -1
- package/dist/command-base-enterprise.d.ts +23 -2
- package/dist/command-base-enterprise.js +82 -26
- package/dist/command-base-enterprise.js.map +1 -1
- package/dist/command-base-exec.js +4 -2
- package/dist/command-base-exec.js.map +1 -1
- package/dist/commands/asset/deploy.d.ts +2 -1
- package/dist/commands/asset/deploy.js +3 -2
- package/dist/commands/asset/deploy.js.map +1 -1
- package/dist/commands/asset/list.d.ts +26 -7
- package/dist/commands/asset/list.js +127 -112
- package/dist/commands/asset/list.js.map +1 -1
- package/dist/commands/asset/probe/create.d.ts +26 -5
- package/dist/commands/asset/probe/create.js +182 -164
- package/dist/commands/asset/probe/create.js.map +1 -1
- package/dist/commands/asset/recycle.js +3 -4
- package/dist/commands/asset/recycle.js.map +1 -1
- package/dist/commands/asset/undeploy.d.ts +24 -9
- package/dist/commands/asset/undeploy.js +162 -161
- package/dist/commands/asset/undeploy.js.map +1 -1
- package/dist/commands/asset/view.js +1 -1
- package/dist/commands/asset/view.js.map +1 -1
- package/dist/commands/asset/volume/create.d.ts +24 -13
- package/dist/commands/asset/volume/create.js +153 -158
- package/dist/commands/asset/volume/create.js.map +1 -1
- package/dist/commands/asset/volume/delete.d.ts +21 -7
- package/dist/commands/asset/volume/delete.js +107 -101
- package/dist/commands/asset/volume/delete.js.map +1 -1
- package/dist/commands/asset/volume/list.d.ts +23 -9
- package/dist/commands/asset/volume/list.js +74 -54
- package/dist/commands/asset/volume/list.js.map +1 -1
- package/dist/commands/cabinet/cluster/attach.d.ts +32 -0
- package/dist/commands/cabinet/cluster/attach.js +144 -0
- package/dist/commands/cabinet/cluster/attach.js.map +1 -0
- package/dist/commands/cabinet/create.d.ts +1 -0
- package/dist/commands/cabinet/create.js +5 -1
- package/dist/commands/cabinet/create.js.map +1 -1
- package/dist/commands/cabinet/list.d.ts +27 -6
- package/dist/commands/cabinet/list.js +130 -121
- package/dist/commands/cabinet/list.js.map +1 -1
- package/dist/commands/cabinet/obliterate.d.ts +1 -0
- package/dist/commands/cabinet/obliterate.js +5 -1
- package/dist/commands/cabinet/obliterate.js.map +1 -1
- package/dist/commands/cabinet/restore.d.ts +36 -0
- package/dist/commands/cabinet/restore.js +186 -0
- package/dist/commands/cabinet/restore.js.map +1 -0
- package/dist/commands/cluster/agent/configure.d.ts +47 -0
- package/dist/commands/cluster/agent/configure.js +320 -0
- package/dist/commands/cluster/agent/configure.js.map +1 -0
- package/dist/commands/cluster/agent/install.d.ts +32 -0
- package/dist/commands/cluster/agent/install.js +152 -0
- package/dist/commands/cluster/agent/install.js.map +1 -0
- package/dist/commands/cluster/agent/uninstall.d.ts +29 -0
- package/dist/commands/cluster/agent/uninstall.js +130 -0
- package/dist/commands/cluster/agent/uninstall.js.map +1 -0
- package/dist/commands/cluster/bootstrap.d.ts +50 -0
- package/dist/commands/cluster/bootstrap.js +310 -0
- package/dist/commands/cluster/bootstrap.js.map +1 -0
- package/dist/commands/cluster/connect.d.ts +0 -5
- package/dist/commands/cluster/connect.js +1 -26
- package/dist/commands/cluster/connect.js.map +1 -1
- package/dist/commands/cluster/install.d.ts +45 -0
- package/dist/commands/cluster/install.js +224 -0
- package/dist/commands/cluster/install.js.map +1 -0
- package/dist/commands/cluster/stack/capture.js +0 -2
- package/dist/commands/cluster/stack/capture.js.map +1 -1
- package/dist/commands/cluster/stack/install.d.ts +40 -0
- package/dist/commands/cluster/stack/install.js +196 -0
- package/dist/commands/cluster/stack/install.js.map +1 -0
- package/dist/commands/cluster/start.d.ts +0 -5
- package/dist/commands/cluster/start.js +1 -27
- package/dist/commands/cluster/start.js.map +1 -1
- package/dist/commands/cluster/stop.d.ts +0 -5
- package/dist/commands/cluster/stop.js +1 -27
- package/dist/commands/cluster/stop.js.map +1 -1
- package/dist/commands/config/add.d.ts +9 -11
- package/dist/commands/config/add.js +59 -125
- package/dist/commands/config/add.js.map +1 -1
- package/dist/commands/config/delete.d.ts +22 -11
- package/dist/commands/config/delete.js +28 -83
- package/dist/commands/config/delete.js.map +1 -1
- package/dist/commands/config/deploy.d.ts +26 -8
- package/dist/commands/config/deploy.js +169 -198
- package/dist/commands/config/deploy.js.map +1 -1
- package/dist/commands/config/import.d.ts +27 -22
- package/dist/commands/config/import.js +222 -253
- package/dist/commands/config/import.js.map +1 -1
- package/dist/commands/config/settings/get.d.ts +25 -14
- package/dist/commands/config/settings/get.js +30 -123
- package/dist/commands/config/settings/get.js.map +1 -1
- package/dist/commands/config/view.d.ts +26 -6
- package/dist/commands/config/view.js +112 -95
- package/dist/commands/config/view.js.map +1 -1
- package/dist/commands/csp/logout.d.ts +23 -6
- package/dist/commands/csp/logout.js +86 -63
- package/dist/commands/csp/logout.js.map +1 -1
- package/dist/commands/deploy.d.ts +31 -14
- package/dist/commands/deploy.js +264 -385
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/enterprise/list.d.ts +22 -4
- package/dist/commands/enterprise/list.js +97 -67
- package/dist/commands/enterprise/list.js.map +1 -1
- package/dist/commands/env/add.d.ts +26 -7
- package/dist/commands/env/add.js +182 -179
- package/dist/commands/env/add.js.map +1 -1
- package/dist/commands/environment/cluster/attach.d.ts +1 -0
- package/dist/commands/environment/cluster/attach.js +5 -1
- package/dist/commands/environment/cluster/attach.js.map +1 -1
- package/dist/commands/environment/cluster/detach.d.ts +1 -0
- package/dist/commands/environment/cluster/detach.js +5 -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 +5 -1
- package/dist/commands/environment/create.js.map +1 -1
- package/dist/commands/environment/delete.d.ts +39 -0
- package/dist/commands/environment/delete.js +135 -0
- package/dist/commands/environment/delete.js.map +1 -0
- package/dist/commands/environment/list.d.ts +28 -9
- package/dist/commands/environment/list.js +128 -167
- package/dist/commands/environment/list.js.map +1 -1
- package/dist/commands/host/map.d.ts +29 -19
- package/dist/commands/host/map.js +263 -324
- package/dist/commands/host/map.js.map +1 -1
- package/dist/commands/imageRegistry/capture.d.ts +12 -11
- package/dist/commands/imageRegistry/capture.js +49 -113
- package/dist/commands/imageRegistry/capture.js.map +1 -1
- package/dist/commands/imageRegistry/forget.d.ts +12 -11
- package/dist/commands/imageRegistry/forget.js +53 -114
- package/dist/commands/imageRegistry/forget.js.map +1 -1
- package/dist/commands/imageRegistry/pullSecret/set.d.ts +21 -11
- package/dist/commands/imageRegistry/pullSecret/set.js +184 -278
- package/dist/commands/imageRegistry/pullSecret/set.js.map +1 -1
- package/dist/commands/imageRegistry/pullSecret/unset.d.ts +19 -11
- package/dist/commands/imageRegistry/pullSecret/unset.js +117 -190
- package/dist/commands/imageRegistry/pullSecret/unset.js.map +1 -1
- package/dist/commands/images/add.d.ts +19 -6
- package/dist/commands/images/add.js +63 -53
- package/dist/commands/images/add.js.map +1 -1
- package/dist/commands/kit/create.d.ts +22 -10
- package/dist/commands/kit/create.js +119 -121
- package/dist/commands/kit/create.js.map +1 -1
- package/dist/commands/logout.d.ts +21 -5
- package/dist/commands/logout.js +44 -25
- package/dist/commands/logout.js.map +1 -1
- package/dist/commands/noc/cluster/create.js +22 -10
- package/dist/commands/noc/cluster/create.js.map +1 -1
- package/dist/commands/noc/cluster/credentials-set.d.ts +38 -0
- package/dist/commands/noc/cluster/credentials-set.js +174 -0
- package/dist/commands/noc/cluster/credentials-set.js.map +1 -0
- package/dist/commands/noc/cluster/define.d.ts +46 -0
- package/dist/commands/noc/cluster/define.js +305 -0
- package/dist/commands/noc/cluster/define.js.map +1 -0
- package/dist/commands/noc/cluster/deinit.d.ts +22 -5
- package/dist/commands/noc/cluster/deinit.js +99 -106
- package/dist/commands/noc/cluster/deinit.js.map +1 -1
- package/dist/commands/noc/cluster/forget.js +2 -4
- package/dist/commands/noc/cluster/forget.js.map +1 -1
- package/dist/commands/noc/cluster/grant.d.ts +20 -11
- package/dist/commands/noc/cluster/grant.js +94 -132
- package/dist/commands/noc/cluster/grant.js.map +1 -1
- package/dist/commands/noc/cluster/init.d.ts +25 -7
- package/dist/commands/noc/cluster/init.js +121 -133
- package/dist/commands/noc/cluster/init.js.map +1 -1
- package/dist/commands/noc/cluster/journal.d.ts +0 -5
- package/dist/commands/noc/cluster/journal.js +1 -26
- package/dist/commands/noc/cluster/journal.js.map +1 -1
- package/dist/commands/noc/cluster/list.d.ts +23 -5
- package/dist/commands/noc/cluster/list.js +107 -111
- package/dist/commands/noc/cluster/list.js.map +1 -1
- package/dist/commands/noc/cluster/restore.d.ts +36 -0
- package/dist/commands/noc/cluster/restore.js +196 -0
- package/dist/commands/noc/cluster/restore.js.map +1 -0
- package/dist/commands/portal.d.ts +21 -5
- package/dist/commands/portal.js +37 -36
- package/dist/commands/portal.js.map +1 -1
- package/dist/commands/secretStore/capture.d.ts +13 -11
- package/dist/commands/secretStore/capture.js +63 -123
- package/dist/commands/secretStore/capture.js.map +1 -1
- package/dist/commands/secretStore/forget.d.ts +13 -11
- package/dist/commands/secretStore/forget.js +55 -111
- package/dist/commands/secretStore/forget.js.map +1 -1
- package/dist/commands/shell/init.d.ts +15 -0
- package/dist/commands/shell/init.js +96 -0
- package/dist/commands/shell/init.js.map +1 -0
- package/dist/commands/snapshot/deploy.d.ts +22 -42
- package/dist/commands/snapshot/deploy.js +173 -269
- package/dist/commands/snapshot/deploy.js.map +1 -1
- package/dist/commands/snapshot/list.d.ts +26 -5
- package/dist/commands/snapshot/list.js +116 -109
- package/dist/commands/snapshot/list.js.map +1 -1
- package/dist/commands/tenant/create.d.ts +18 -13
- package/dist/commands/tenant/create.js +69 -69
- package/dist/commands/tenant/create.js.map +1 -1
- package/dist/commands/tenant/switch.d.ts +18 -12
- package/dist/commands/tenant/switch.js +65 -59
- package/dist/commands/tenant/switch.js.map +1 -1
- package/dist/commands/whereami.d.ts +18 -8
- package/dist/commands/whereami.js +67 -102
- package/dist/commands/whereami.js.map +1 -1
- package/dist/commands/whoami.d.ts +19 -3
- package/dist/commands/whoami.js +44 -13
- package/dist/commands/whoami.js.map +1 -1
- package/dist/ops/i-user-input-provider.d.ts +20 -1
- package/dist/ops/i-user-input-provider.js.map +1 -1
- package/dist/ops/test/mock-ui.d.ts +2 -1
- package/dist/ops/test/mock-ui.js +3 -0
- package/dist/ops/test/mock-ui.js.map +1 -1
- package/dist/ops/throwing-user-input-provider.d.ts +2 -1
- package/dist/ops/throwing-user-input-provider.js +3 -0
- package/dist/ops/throwing-user-input-provider.js.map +1 -1
- package/dist/relay/relay-container.js +1 -1
- package/dist/sdk-adapters/other/other-cluster-configurator.d.ts +24 -0
- package/dist/sdk-adapters/other/other-cluster-configurator.js +80 -0
- package/dist/sdk-adapters/other/other-cluster-configurator.js.map +1 -0
- package/dist/sdk-adapters/other/other-login-configurator.d.ts +24 -0
- package/dist/sdk-adapters/other/other-login-configurator.js +68 -0
- package/dist/sdk-adapters/other/other-login-configurator.js.map +1 -0
- package/dist/uilogic/cloud-resource-configurator-factory.js +12 -0
- package/dist/uilogic/cloud-resource-configurator-factory.js.map +1 -1
- package/dist/uilogic/lrp-watcher-predef.d.ts +2 -1
- package/dist/uilogic/lrp-watcher-predef.js +31 -17
- package/dist/uilogic/lrp-watcher-predef.js.map +1 -1
- package/dist/uilogic/lrp-watcher-utils.d.ts +2 -0
- package/dist/uilogic/lrp-watcher-utils.js +2 -0
- package/dist/uilogic/lrp-watcher-utils.js.map +1 -1
- package/dist/uilogic/rootmap-ui-utils.d.ts +18 -1
- package/dist/uilogic/rootmap-ui-utils.js +30 -0
- package/dist/uilogic/rootmap-ui-utils.js.map +1 -1
- package/dist/uilogic/tenant-contextualizer.js +11 -1
- package/dist/uilogic/tenant-contextualizer.js.map +1 -1
- package/dist/user-context-loader.d.ts +12 -7
- package/dist/user-context-loader.js +89 -43
- package/dist/user-context-loader.js.map +1 -1
- package/oclif.manifest.json +3984 -1453
- package/package.json +2 -2
- package/dist/commands/noc/cluster/recreate.d.ts +0 -28
- package/dist/commands/noc/cluster/recreate.js +0 -197
- package/dist/commands/noc/cluster/recreate.js.map +0 -1
package/dist/ops/test/mock-ui.js
CHANGED
|
@@ -68,6 +68,9 @@ class MockUi {
|
|
|
68
68
|
promptSelectMulti(id, prompt, choices, loop) {
|
|
69
69
|
return this.getArrayValue(id);
|
|
70
70
|
}
|
|
71
|
+
promptSelectFuzzy(id, prompt, fetchChoices, suggestOnly, defaultValue, searchOnRemote, validate) {
|
|
72
|
+
return this.getValue(id);
|
|
73
|
+
}
|
|
71
74
|
promptSelectFile(id, prompt, fileOptions) {
|
|
72
75
|
return this.getValue(id);
|
|
73
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock-ui.js","sourceRoot":"","sources":["../../../src/ops/test/mock-ui.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mock-ui.js","sourceRoot":"","sources":["../../../src/ops/test/mock-ui.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import "reflect-metadata";
|
|
2
2
|
import { IBetterLogger } from "@codiac.io/codiac-common/IBetterLogger";
|
|
3
|
-
import { EntryValue, choice, IUserInputProvider, FileSelectionOptions, FolderSelectionOptions } from "./i-user-input-provider";
|
|
3
|
+
import { EntryValue, choice, IUserInputProvider, FileSelectionOptions, FolderSelectionOptions, SelectOption, BooleanValidationResult } from "./i-user-input-provider";
|
|
4
4
|
/** For use in a non-TTY scenario: Throws on any request for user interaction.
|
|
5
5
|
*/
|
|
6
6
|
export declare class ThrowingUserInputProvider implements IUserInputProvider {
|
|
@@ -17,6 +17,7 @@ export declare class ThrowingUserInputProvider implements IUserInputProvider {
|
|
|
17
17
|
promptPassword(id: string, prompt: string): Promise<string>;
|
|
18
18
|
promptSelect<T extends EntryValue>(id: string, prompt: string, choices: choice<T>[], multiSelect?: boolean, loop?: boolean): Promise<T | undefined>;
|
|
19
19
|
promptSelectMulti<T extends EntryValue>(id: string, prompt: string, choices: choice<T>[], loop?: boolean): Promise<T[] | undefined>;
|
|
20
|
+
promptSelectFuzzy<T>(id: string, prompt: string, fetchChoices: (searchString?: string) => Promise<SelectOption<T>[]>, suggestOnly?: boolean, defaultValue?: T, searchOnRemote?: boolean, validate?: (candidate: T) => BooleanValidationResult): Promise<T | undefined>;
|
|
20
21
|
promptSelectFile(id: string, prompt: string, fileOptions: FileSelectionOptions): Promise<string>;
|
|
21
22
|
promptSelectFolder(id: string, prompt: string, folderOptions: FolderSelectionOptions): Promise<string>;
|
|
22
23
|
promptConfirm(id: string, prompt: string, defaultValue?: boolean): Promise<boolean>;
|
|
@@ -44,6 +44,9 @@ let ThrowingUserInputProvider = class ThrowingUserInputProvider {
|
|
|
44
44
|
promptSelectMulti(id, prompt, choices, loop) {
|
|
45
45
|
throw new Error(`Cannot acquire input [id: ${id}]: this cli command disabled all user input.`);
|
|
46
46
|
}
|
|
47
|
+
promptSelectFuzzy(id, prompt, fetchChoices, suggestOnly, defaultValue, searchOnRemote, validate) {
|
|
48
|
+
throw new Error(`Cannot acquire input [id: ${id}]: this cli command disabled all user input.`);
|
|
49
|
+
}
|
|
47
50
|
promptSelectFile(id, prompt, fileOptions) {
|
|
48
51
|
throw new Error(`Cannot acquire input [id: ${id}]: this cli command disabled all user input.`);
|
|
49
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"throwing-user-input-provider.js","sourceRoot":"","sources":["../../src/ops/throwing-user-input-provider.ts"],"names":[],"mappings":";;;;AAAA,4BAAyB;AACzB,yCAA0D;AAC1D,sCAAiC;AACjC,4DAAsD;AAKtD;GACG;AAEI,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IACpC;;;;OAIG;IACH,YAC4C,MAAqB,EAC1C,sBAAsD,OAAO;QADxC,WAAM,GAAN,MAAM,CAAe;QAC1C,wBAAmB,GAAnB,mBAAmB,CAA0C;IAGpF,CAAC;IACD,WAAW,CAAC,OAAe;QACzB,QAAQ,IAAI,CAAC,mBAAmB,EAAE;YAChC,KAAK,UAAU;gBACb,aAAa;gBACb,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC5B,MAAM;YACR,KAAK,OAAO;gBACV,MAAM,IAAI,KAAK,CAAC,6EAA6E,CAAC,CAAC;YACjG,KAAK,OAAO,CAAC;YACb;gBACE,SAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAChB,MAAM;SACT;IACH,CAAC;IACD,MAAM,CAAuB,EAAU,EAAE,MAAc,EAAE,QAAkB,EAAE,YAAgB;QAC3F,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IACD,cAAc,CAAC,EAAU,EAAE,MAAc;QACvC,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IACD,YAAY,CAAuB,EAAU,EAAE,MAAc,EAAE,OAAoB,EAAE,WAAqB,EAAE,IAAc;QACxH,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IACD,iBAAiB,CAAuB,EAAU,EAAE,MAAc,EAAE,OAAoB,EAAE,IAAc;QACtG,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IACD,gBAAgB,CAAC,EAAU,EAAE,MAAc,EAAE,WAAiC;QAC5E,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IACD,kBAAkB,CAAC,EAAU,EAAE,MAAc,EAAE,aAAqC;QAClF,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IACD,aAAa,CAAC,EAAU,EAAE,MAAc,EAAE,YAAsB;QAC9D,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IAED,OAAO,CAAC,GAAW;QACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,GAAG,8CAA8C,CAAC,CAAC;IAC3G,CAAC;IACD,YAAY,CAAC,WAAmB;QAC9B,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;IACD,WAAW,CAAC,WAAmB;QAC7B,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;CAEF,CAAA;
|
|
1
|
+
{"version":3,"file":"throwing-user-input-provider.js","sourceRoot":"","sources":["../../src/ops/throwing-user-input-provider.ts"],"names":[],"mappings":";;;;AAAA,4BAAyB;AACzB,yCAA0D;AAC1D,sCAAiC;AACjC,4DAAsD;AAKtD;GACG;AAEI,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IACpC;;;;OAIG;IACH,YAC4C,MAAqB,EAC1C,sBAAsD,OAAO;QADxC,WAAM,GAAN,MAAM,CAAe;QAC1C,wBAAmB,GAAnB,mBAAmB,CAA0C;IAGpF,CAAC;IACD,WAAW,CAAC,OAAe;QACzB,QAAQ,IAAI,CAAC,mBAAmB,EAAE;YAChC,KAAK,UAAU;gBACb,aAAa;gBACb,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC5B,MAAM;YACR,KAAK,OAAO;gBACV,MAAM,IAAI,KAAK,CAAC,6EAA6E,CAAC,CAAC;YACjG,KAAK,OAAO,CAAC;YACb;gBACE,SAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAChB,MAAM;SACT;IACH,CAAC;IACD,MAAM,CAAuB,EAAU,EAAE,MAAc,EAAE,QAAkB,EAAE,YAAgB;QAC3F,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IACD,cAAc,CAAC,EAAU,EAAE,MAAc;QACvC,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IACD,YAAY,CAAuB,EAAU,EAAE,MAAc,EAAE,OAAoB,EAAE,WAAqB,EAAE,IAAc;QACxH,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IACD,iBAAiB,CAAuB,EAAU,EAAE,MAAc,EAAE,OAAoB,EAAE,IAAc;QACtG,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IACD,iBAAiB,CAAI,EAAU,EAAE,MAAc,EAAE,YAAmE,EAAE,WAAqB,EAAE,YAAgB,EAAE,cAAwB,EAAE,QAAoD;QAC3O,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IACD,gBAAgB,CAAC,EAAU,EAAE,MAAc,EAAE,WAAiC;QAC5E,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IACD,kBAAkB,CAAC,EAAU,EAAE,MAAc,EAAE,aAAqC;QAClF,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IACD,aAAa,CAAC,EAAU,EAAE,MAAc,EAAE,YAAsB;QAC9D,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,8CAA8C,CAAC,CAAC;IACjG,CAAC;IAED,OAAO,CAAC,GAAW;QACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,GAAG,8CAA8C,CAAC,CAAC;IAC3G,CAAC;IACD,YAAY,CAAC,WAAmB;QAC9B,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;IACD,WAAW,CAAC,WAAmB;QAC7B,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;CAEF,CAAA;AA7DY,yBAAyB;IADrC,IAAA,sBAAU,GAAE;IAQR,mBAAA,IAAA,kBAAM,EAAC,0BAAU,CAAC,aAAa,CAAC,CAAA;IAChC,mBAAA,IAAA,qBAAS,GAAE,CAAA;;GARH,yBAAyB,CA6DrC;AA7DY,8DAAyB"}
|
|
@@ -18,7 +18,7 @@ const entities_1 = require("../ops/entities");
|
|
|
18
18
|
// Configuration defaults
|
|
19
19
|
const DEFAULT_CONFIG = {
|
|
20
20
|
IMAGE_NAME: "codiacimages/codiac-relay",
|
|
21
|
-
IMAGE_TAG: "1.6.
|
|
21
|
+
IMAGE_TAG: "1.6.138",
|
|
22
22
|
CONTAINER_NAME: "codiac-relay",
|
|
23
23
|
HEALTH_CHECK_URL: "http://localhost:5799/heartbeat-json",
|
|
24
24
|
RETRY_TIMEOUT_MINUTES: 1,
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { IBetterLogger } from "@codiac.io/codiac-common";
|
|
2
|
+
import { UserNameTenantCode } from "@codiac.io/codiac-ops-common";
|
|
3
|
+
import { RelayClient as GenRelayClient } from "../../apis/codiac-relay";
|
|
4
|
+
import { CloudProviderEnum, ClusterDef, IngressDef, RootMap } from "../../apis/codiac-api/contracts";
|
|
5
|
+
import { ClusterCaptureDef } from "../../codiac-entities/cluster-capture-def";
|
|
6
|
+
import { IOutputStyler, IUserInputProvider } from "../../ops";
|
|
7
|
+
import { ResourceConfiguratorBase } from "../shared/resource-configurator-base";
|
|
8
|
+
export declare class OtherClusterConfigurator extends ResourceConfiguratorBase {
|
|
9
|
+
constructor(codiacUser: UserNameTenantCode, genRelayClient: GenRelayClient, ui: IUserInputProvider, styler: IOutputStyler, logger: IBetterLogger);
|
|
10
|
+
get cloudProvider(): CloudProviderEnum;
|
|
11
|
+
defineCluster(initial: Partial<ClusterDef>, defaults?: Partial<ClusterDef>): Promise<{
|
|
12
|
+
spec: ClusterDef;
|
|
13
|
+
defaults: Partial<ClusterDef>;
|
|
14
|
+
}>;
|
|
15
|
+
/**
|
|
16
|
+
* Cluster capture is not applicable for self-managed clusters.
|
|
17
|
+
* Use `cod cluster credentials-set` to register connection credentials instead.
|
|
18
|
+
*/
|
|
19
|
+
defineClusterCaptureParams(_initial: Partial<ClusterDef>, _rootMap: RootMap, _defaults?: Partial<ClusterDef>): Promise<{
|
|
20
|
+
spec: ClusterCaptureDef;
|
|
21
|
+
defaults: Partial<ClusterDef>;
|
|
22
|
+
}>;
|
|
23
|
+
promptForIngressSpec(_current?: Partial<IngressDef>): Promise<IngressDef | undefined>;
|
|
24
|
+
}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.OtherClusterConfigurator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const inversify_1 = require("inversify");
|
|
6
|
+
const codiac_common_1 = require("@codiac.io/codiac-common");
|
|
7
|
+
const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
|
|
8
|
+
const codiac_relay_1 = require("../../apis/codiac-relay");
|
|
9
|
+
const contracts_1 = require("../../apis/codiac-api/contracts");
|
|
10
|
+
const ops_1 = require("../../ops");
|
|
11
|
+
const resource_configurator_base_1 = require("../shared/resource-configurator-base");
|
|
12
|
+
let OtherClusterConfigurator = class OtherClusterConfigurator extends resource_configurator_base_1.ResourceConfiguratorBase {
|
|
13
|
+
constructor(codiacUser, genRelayClient, ui, styler, logger) {
|
|
14
|
+
super(codiacUser, genRelayClient, ui, styler, logger);
|
|
15
|
+
}
|
|
16
|
+
get cloudProvider() {
|
|
17
|
+
return contracts_1.CloudProviderEnum.other;
|
|
18
|
+
}
|
|
19
|
+
/* ***********************************************************************************
|
|
20
|
+
* _____ _ _
|
|
21
|
+
* / __ \ | | |
|
|
22
|
+
* | / \/ |_ _ ___| |_ ___ _ __
|
|
23
|
+
* | | | | | | / __| __/ _ \ '__|
|
|
24
|
+
* | \__/\ | |_| \__ \ || __/ |
|
|
25
|
+
* \____/_|\__,_|___/\__\___|_|
|
|
26
|
+
*
|
|
27
|
+
* ***********************************************************************************/
|
|
28
|
+
defineCluster(initial, defaults) {
|
|
29
|
+
var _a, _b, _c;
|
|
30
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
31
|
+
const w = {};
|
|
32
|
+
w.provider = this.cloudProvider;
|
|
33
|
+
w.privateOwner = this.codiacUser.tenantCode;
|
|
34
|
+
[initial, defaults] = yield this.applyClusterDefaults(w, initial, defaults);
|
|
35
|
+
w.name = yield this.promptForName(initial === null || initial === void 0 ? void 0 : initial.name);
|
|
36
|
+
w.providerSubscription = (yield this._ui.prompt('providerSubscription', 'Cluster label (providerSubscription):', true, initial === null || initial === void 0 ? void 0 : initial.providerSubscription));
|
|
37
|
+
w.locationName = (yield this._ui.prompt('locationName', 'Location (e.g. on-prem, datacenter-1):', true, initial === null || initial === void 0 ? void 0 : initial.locationName));
|
|
38
|
+
w.nodeSpec = (yield this._ui.prompt('nodeSpec', 'Node spec (descriptive label, e.g. custom):', true, initial === null || initial === void 0 ? void 0 : initial.nodeSpec));
|
|
39
|
+
const nodeQtyRaw = yield this._ui.prompt('nodeQty', 'Node count:', true, (_b = (_a = initial === null || initial === void 0 ? void 0 : initial.startingNodeCount) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '1');
|
|
40
|
+
w.startingNodeCount = parseInt(nodeQtyRaw, 10);
|
|
41
|
+
// Free-text version prompt — no version list available for self-managed clusters.
|
|
42
|
+
w.k8sVersion = (yield this._ui.prompt('k8sVersion', 'Kubernetes version (e.g. 1.29.0):', true, initial === null || initial === void 0 ? void 0 : initial.k8sVersion));
|
|
43
|
+
// Not applicable for self-managed clusters.
|
|
44
|
+
w.providerGroup = '';
|
|
45
|
+
const spec = Object.assign({ name: w.name, provider: w.provider, providerSubscription: w.providerSubscription, locationName: w.locationName, providerGroup: w.providerGroup, nodeCount: w.nodeCount, ingressDef: w.ingressDef, privateOwner: w.privateOwner, nodeSpec: w.nodeSpec, startingNodeCount: w.startingNodeCount, identitySpec: (_c = w.identitySpec) !== null && _c !== void 0 ? _c : { type: contracts_1.SecurityAccountTypeEnum.servicePrincipal, name: '' } }, this.createAuditable());
|
|
46
|
+
if (w.k8sVersion)
|
|
47
|
+
spec.k8sVersion = w.k8sVersion;
|
|
48
|
+
if (w.subnet)
|
|
49
|
+
spec.subnet = w.subnet;
|
|
50
|
+
return { spec, defaults };
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* Cluster capture is not applicable for self-managed clusters.
|
|
55
|
+
* Use `cod cluster credentials-set` to register connection credentials instead.
|
|
56
|
+
*/
|
|
57
|
+
defineClusterCaptureParams(_initial, _rootMap, _defaults) {
|
|
58
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
59
|
+
throw new Error('Cluster capture is not supported for self-managed clusters. ' +
|
|
60
|
+
'Use `cod cluster credentials-set` to register connection credentials instead.');
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
promptForIngressSpec(_current) {
|
|
64
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
65
|
+
throw new Error('Method not implemented.');
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
OtherClusterConfigurator = tslib_1.__decorate([
|
|
70
|
+
(0, inversify_1.injectable)(),
|
|
71
|
+
tslib_1.__param(0, (0, inversify_1.inject)(codiac_ops_common_1.UserNameTenantCode)),
|
|
72
|
+
tslib_1.__param(1, (0, inversify_1.inject)(codiac_relay_1.RelayClient)),
|
|
73
|
+
tslib_1.__param(2, (0, inversify_1.inject)(ops_1.INTERFACES_CLI.IUserInputProvider)),
|
|
74
|
+
tslib_1.__param(3, (0, inversify_1.inject)(ops_1.INTERFACES_CLI.IOutputStyler)),
|
|
75
|
+
tslib_1.__param(4, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
|
|
76
|
+
tslib_1.__metadata("design:paramtypes", [codiac_ops_common_1.UserNameTenantCode,
|
|
77
|
+
codiac_relay_1.RelayClient, Object, Object, Object])
|
|
78
|
+
], OtherClusterConfigurator);
|
|
79
|
+
exports.OtherClusterConfigurator = OtherClusterConfigurator;
|
|
80
|
+
//# sourceMappingURL=other-cluster-configurator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"other-cluster-configurator.js","sourceRoot":"","sources":["../../../src/sdk-adapters/other/other-cluster-configurator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { IBetterLogger } from "@codiac.io/codiac-common";
|
|
2
|
+
import { UserNameTenantCode } from "@codiac.io/codiac-ops-common";
|
|
3
|
+
import { CspPrimaryCredsMeta, LogintoCloudProviderRequest } from "../../apis/codiac-relay/contracts";
|
|
4
|
+
import { CloudProviderEnum } from "../../apis/codiac-api/contracts";
|
|
5
|
+
import * as sdk from "../../sdk";
|
|
6
|
+
import { ICspAccountFilter, ICspLoginOptions } from "../../sdk";
|
|
7
|
+
export declare class OtherLoginConfigurator implements sdk.ILoginConfigurator {
|
|
8
|
+
private codiacUser;
|
|
9
|
+
private logger;
|
|
10
|
+
constructor(codiacUser: UserNameTenantCode, logger: IBetterLogger);
|
|
11
|
+
get cloudProvider(): CloudProviderEnum;
|
|
12
|
+
/**
|
|
13
|
+
* No cloud-provider login is required for self-managed clusters.
|
|
14
|
+
* Connection credentials are registered separately via `cod cluster credentials-set`.
|
|
15
|
+
*
|
|
16
|
+
* This stub is intentionally structured as a full ILoginConfigurator implementation
|
|
17
|
+
* so that per-cluster credential management can be added here when the need arises.
|
|
18
|
+
*/
|
|
19
|
+
promptToLogin(options?: ICspLoginOptions): Promise<[boolean, CspPrimaryCredsMeta, string | undefined]>;
|
|
20
|
+
promptToLogout(_account?: ICspAccountFilter): Promise<[boolean, string]>;
|
|
21
|
+
assembleLoginRequest(user: string | undefined, secret: string | undefined, subscriptionId: string | undefined, _proprietaryInput: {
|
|
22
|
+
[key: string]: any;
|
|
23
|
+
}): LogintoCloudProviderRequest;
|
|
24
|
+
}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.OtherLoginConfigurator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const inversify_1 = require("inversify");
|
|
6
|
+
const codiac_common_1 = require("@codiac.io/codiac-common");
|
|
7
|
+
const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
|
|
8
|
+
const contracts_1 = require("../../apis/codiac-api/contracts");
|
|
9
|
+
let OtherLoginConfigurator = class OtherLoginConfigurator {
|
|
10
|
+
constructor(codiacUser, logger) {
|
|
11
|
+
this.codiacUser = codiacUser;
|
|
12
|
+
this.logger = logger;
|
|
13
|
+
}
|
|
14
|
+
get cloudProvider() {
|
|
15
|
+
return contracts_1.CloudProviderEnum.other;
|
|
16
|
+
}
|
|
17
|
+
/* ***********************************************************************************
|
|
18
|
+
* ___ _ _
|
|
19
|
+
* / _ \ | | | |
|
|
20
|
+
* / /_\ \_ _| |_| |__
|
|
21
|
+
* | _ | | | | __| '_ \
|
|
22
|
+
* | | | | |_| | |_| | | |
|
|
23
|
+
* \_| |_/\__,_|\__|_| |_|
|
|
24
|
+
*
|
|
25
|
+
* ***********************************************************************************/
|
|
26
|
+
/**
|
|
27
|
+
* No cloud-provider login is required for self-managed clusters.
|
|
28
|
+
* Connection credentials are registered separately via `cod cluster credentials-set`.
|
|
29
|
+
*
|
|
30
|
+
* This stub is intentionally structured as a full ILoginConfigurator implementation
|
|
31
|
+
* so that per-cluster credential management can be added here when the need arises.
|
|
32
|
+
*/
|
|
33
|
+
promptToLogin(options) {
|
|
34
|
+
var _a, _b;
|
|
35
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
36
|
+
this.logger.debug(`No CSP login required for ${this.cloudProvider}.`);
|
|
37
|
+
const cspUser = {
|
|
38
|
+
provider: this.cloudProvider,
|
|
39
|
+
subscriptionId: (_a = options === null || options === void 0 ? void 0 : options.providerSubscriptionId) !== null && _a !== void 0 ? _a : '',
|
|
40
|
+
tenantCode: this.codiacUser.tenantCode,
|
|
41
|
+
username: (_b = options === null || options === void 0 ? void 0 : options.providedUserName) !== null && _b !== void 0 ? _b : this.codiacUser.username,
|
|
42
|
+
created: new Date(),
|
|
43
|
+
};
|
|
44
|
+
return [true, cspUser, undefined];
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
promptToLogout(_account) {
|
|
48
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
49
|
+
return [true, this.codiacUser.username];
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
assembleLoginRequest(user, secret, subscriptionId, _proprietaryInput) {
|
|
53
|
+
return {
|
|
54
|
+
providerCode: this.cloudProvider,
|
|
55
|
+
providerSubscription: subscriptionId,
|
|
56
|
+
username: user,
|
|
57
|
+
secret: secret,
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
};
|
|
61
|
+
OtherLoginConfigurator = tslib_1.__decorate([
|
|
62
|
+
(0, inversify_1.injectable)(),
|
|
63
|
+
tslib_1.__param(0, (0, inversify_1.inject)(codiac_ops_common_1.UserNameTenantCode)),
|
|
64
|
+
tslib_1.__param(1, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
|
|
65
|
+
tslib_1.__metadata("design:paramtypes", [codiac_ops_common_1.UserNameTenantCode, Object])
|
|
66
|
+
], OtherLoginConfigurator);
|
|
67
|
+
exports.OtherLoginConfigurator = OtherLoginConfigurator;
|
|
68
|
+
//# sourceMappingURL=other-login-configurator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"other-login-configurator.js","sourceRoot":"","sources":["../../../src/sdk-adapters/other/other-login-configurator.ts"],"names":[],"mappings":";;;;AAAA,yCAA+C;AAC/C,4DAAqE;AACrE,oEAAkE;AAElE,+DAAoE;AAM7D,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAEjC,YACsC,UAA8B,EACxB,MAAqB;QAD3B,eAAU,GAAV,UAAU,CAAoB;QACxB,WAAM,GAAN,MAAM,CAAe;IAC7D,CAAC;IAGL,IAAI,aAAa;QACf,OAAO,6BAAiB,CAAC,KAAK,CAAC;IACjC,CAAC;IAGD;;;;;;;;2FAQuF;IAGvF;;;;;;OAMG;IACU,aAAa,CAAC,OAA0B;;;YACnD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;YACtE,MAAM,OAAO,GAAwB;gBACnC,QAAQ,EAAE,IAAI,CAAC,aAAa;gBAC5B,cAAc,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,sBAAsB,mCAAI,EAAE;gBACrD,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU;gBACtC,QAAQ,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,mCAAI,IAAI,CAAC,UAAU,CAAC,QAAQ;gBAC/D,OAAO,EAAE,IAAI,IAAI,EAAE;aACpB,CAAC;YACF,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;;KACnC;IAGY,cAAc,CAAC,QAA4B;;YACtD,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;KAAA;IAGM,oBAAoB,CACzB,IAAwB,EACxB,MAA0B,EAC1B,cAAkC,EAClC,iBAAyC;QAEzC,OAAoC;YAClC,YAAY,EAAE,IAAI,CAAC,aAAa;YAChC,oBAAoB,EAAE,cAAc;YACpC,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,MAAM;SACf,CAAC;IACJ,CAAC;CACF,CAAA;AA9DY,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAIR,mBAAA,IAAA,kBAAM,EAAC,sCAAkB,CAAC,CAAA;IAC1B,mBAAA,IAAA,kBAAM,EAAC,0BAAU,CAAC,aAAa,CAAC,CAAA;6CADe,sCAAkB;GAHzD,sBAAsB,CA8DlC;AA9DY,wDAAsB"}
|
|
@@ -12,6 +12,8 @@ const docker_hub_1 = require("../sdk-adapters/docker-hub");
|
|
|
12
12
|
const artifact_hub_1 = require("../sdk-adapters/artifact-hub");
|
|
13
13
|
const local_machine_resource_configurator_1 = require("../sdk-adapters/local-machine/local-machine-resource-configurator");
|
|
14
14
|
const local_machine_login_configurator_1 = require("../sdk-adapters/local-machine/local-machine-login-configurator");
|
|
15
|
+
const other_cluster_configurator_1 = require("../sdk-adapters/other/other-cluster-configurator");
|
|
16
|
+
const other_login_configurator_1 = require("../sdk-adapters/other/other-login-configurator");
|
|
15
17
|
class INTERFACES_CLI_ENTERPRISE {
|
|
16
18
|
}
|
|
17
19
|
exports.INTERFACES_CLI_ENTERPRISE = INTERFACES_CLI_ENTERPRISE;
|
|
@@ -88,6 +90,11 @@ let ClusterConfiguratorFactory = ClusterConfiguratorFactory_1 = class ClusterCon
|
|
|
88
90
|
.whenTargetNamed(codiac_domain_1.CloudProviderEnum.localMachine);
|
|
89
91
|
}
|
|
90
92
|
}
|
|
93
|
+
if (!ioc.isBoundNamed(INTERFACES_CLI_ENTERPRISE.IClusterConfigurator, codiac_domain_1.CloudProviderEnum.other)) {
|
|
94
|
+
ioc.bind(INTERFACES_CLI_ENTERPRISE.IClusterConfigurator)
|
|
95
|
+
.to(other_cluster_configurator_1.OtherClusterConfigurator)
|
|
96
|
+
.whenTargetNamed(codiac_domain_1.CloudProviderEnum.other);
|
|
97
|
+
}
|
|
91
98
|
if (!ioc.isBound(ClusterConfiguratorFactory_1)) {
|
|
92
99
|
ioc.bind(ClusterConfiguratorFactory_1).toSelf();
|
|
93
100
|
}
|
|
@@ -207,6 +214,11 @@ let LoginConfiguratorFactory = LoginConfiguratorFactory_1 = class LoginConfigura
|
|
|
207
214
|
.to(local_machine_login_configurator_1.LocalMachineLoginConfigurator)
|
|
208
215
|
.whenTargetNamed(codiac_domain_1.CloudProviderEnum.localMachine);
|
|
209
216
|
}
|
|
217
|
+
if (!ioc.isBoundNamed(INTERFACES_CLI_ENTERPRISE.ILoginConfigurator, codiac_domain_1.CloudProviderEnum.other)) {
|
|
218
|
+
ioc.bind(INTERFACES_CLI_ENTERPRISE.ILoginConfigurator)
|
|
219
|
+
.to(other_login_configurator_1.OtherLoginConfigurator)
|
|
220
|
+
.whenTargetNamed(codiac_domain_1.CloudProviderEnum.other);
|
|
221
|
+
}
|
|
210
222
|
}
|
|
211
223
|
constructor() {
|
|
212
224
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-resource-configurator-factory.js","sourceRoot":"","sources":["../../src/uilogic/cloud-resource-configurator-factory.ts"],"names":[],"mappings":";;;;;AAAA,4DAA6D;AAC7D,yCAAmD;AAEnD,6CAA8D;AAC9D,iDAAkE;AAClE,iDAA0E;AAC1E,2DAA2E;AAC3E,+DAAwE;AACxE,2HAAqH;AACrH,qHAA+G;
|
|
1
|
+
{"version":3,"file":"cloud-resource-configurator-factory.js","sourceRoot":"","sources":["../../src/uilogic/cloud-resource-configurator-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,8 @@ export declare class LrpWatcherPredef {
|
|
|
14
14
|
constructor(msgClient: IMessagingClient, logger: IBetterLogger);
|
|
15
15
|
private readonly qmgr;
|
|
16
16
|
private statusHandlerId;
|
|
17
|
-
|
|
17
|
+
private workUnitEventHandlerId;
|
|
18
|
+
/** Messaging subject for a given event type and correlation. */
|
|
18
19
|
private buildSubject;
|
|
19
20
|
private removeStatusListeners;
|
|
20
21
|
triggerAndWatch<TResult extends Result>(trigger: AsyncTrigger, requestedCorrelationId?: string): Promise<TResult>;
|
|
@@ -25,20 +25,23 @@ let LrpWatcherPredef = class LrpWatcherPredef {
|
|
|
25
25
|
this.logger = logger;
|
|
26
26
|
this.qmgr = new relay_queue_manager_1.QueueManager();
|
|
27
27
|
}
|
|
28
|
-
/** Messaging subject for
|
|
29
|
-
buildSubject(correlationId) {
|
|
28
|
+
/** Messaging subject for a given event type and correlation. */
|
|
29
|
+
buildSubject(eventType, correlationId) {
|
|
30
30
|
var _a;
|
|
31
31
|
if (((_a = this.msgClient.authContext) === null || _a === void 0 ? void 0 : _a.accountCode) == undefined) {
|
|
32
32
|
throw new Error("Cannot form messaging subject: No account code is set in the messaging client.");
|
|
33
33
|
}
|
|
34
34
|
const tenantCode = this.msgClient.authContext.accountCode;
|
|
35
|
-
const subject = event_hub_client_1.NatsEventHubClient.getEventSubject(tenantCode,
|
|
35
|
+
const subject = event_hub_client_1.NatsEventHubClient.getEventSubject(tenantCode, eventType, correlationId, false);
|
|
36
36
|
return subject;
|
|
37
37
|
}
|
|
38
38
|
removeStatusListeners() {
|
|
39
39
|
let closed = false;
|
|
40
40
|
if (this.msgClient) {
|
|
41
|
-
closed = closed && this.msgClient.unsubscribe(this.buildSubject("*"), { subscriptionId: this.statusHandlerId });
|
|
41
|
+
closed = closed && this.msgClient.unsubscribe(this.buildSubject(lrp_watcher_utils_1.LrpWatcherUtils.STATUS_MSG_TYPE, "*"), { subscriptionId: this.statusHandlerId });
|
|
42
|
+
if (this.workUnitEventHandlerId) {
|
|
43
|
+
this.msgClient.unsubscribe(this.buildSubject(lrp_watcher_utils_1.LrpWatcherUtils.WORK_UNIT_OP_STATUS_TYPE, "*"), { subscriptionId: this.workUnitEventHandlerId });
|
|
44
|
+
}
|
|
42
45
|
}
|
|
43
46
|
return closed;
|
|
44
47
|
}
|
|
@@ -55,7 +58,7 @@ let LrpWatcherPredef = class LrpWatcherPredef {
|
|
|
55
58
|
socketId = (_a = this.msgClient.connectionId) !== null && _a !== void 0 ? _a : "unknown";
|
|
56
59
|
}
|
|
57
60
|
const correlationId = requestedCorrelationId !== null && requestedCorrelationId !== void 0 ? requestedCorrelationId : guid_typescript_1.Guid.create().toString();
|
|
58
|
-
this.statusHandlerId = this.msgClient.subscribe(this.buildSubject(correlationId), (err, msg, meta, raw) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
61
|
+
this.statusHandlerId = this.msgClient.subscribe(this.buildSubject(lrp_watcher_utils_1.LrpWatcherUtils.STATUS_MSG_TYPE, correlationId), (err, msg, meta, raw) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
59
62
|
// gotta queue these to prevent msg loss due to
|
|
60
63
|
// client-server latency in triggering each task watcher
|
|
61
64
|
// (server may send messages before the local client task starts listening).
|
|
@@ -68,6 +71,15 @@ let LrpWatcherPredef = class LrpWatcherPredef {
|
|
|
68
71
|
this.qmgr.push(msgForQ, msg.opCode); // todo: consider prefixing with "<CorrelationId>."
|
|
69
72
|
return;
|
|
70
73
|
}));
|
|
74
|
+
this.workUnitEventHandlerId = this.msgClient.subscribe(this.buildSubject(lrp_watcher_utils_1.LrpWatcherUtils.WORK_UNIT_OP_STATUS_TYPE, correlationId), (_err, msg, meta, _raw) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
75
|
+
const msgForQ = {
|
|
76
|
+
action: meta.action,
|
|
77
|
+
correlationId: meta.correlationId,
|
|
78
|
+
payload: msg
|
|
79
|
+
};
|
|
80
|
+
this.qmgr.push(msgForQ, lrp_watcher_utils_1.LrpWatcherUtils.WORK_UNIT_OP_STATUS_TYPE);
|
|
81
|
+
return;
|
|
82
|
+
}));
|
|
71
83
|
// TODO: Make this the first task in the taskMap
|
|
72
84
|
let ack = yield this.invokeOperation(correlationId, socketId, trigger);
|
|
73
85
|
let statusView = this.buildStatusView(ack.taskMap);
|
|
@@ -80,7 +92,7 @@ let LrpWatcherPredef = class LrpWatcherPredef {
|
|
|
80
92
|
result.message = (_c = err.message) !== null && _c !== void 0 ? _c : "Error executing operation: See logs for details";
|
|
81
93
|
}
|
|
82
94
|
finally {
|
|
83
|
-
|
|
95
|
+
this.removeStatusListeners();
|
|
84
96
|
return result;
|
|
85
97
|
}
|
|
86
98
|
});
|
|
@@ -146,17 +158,12 @@ let LrpWatcherPredef = class LrpWatcherPredef {
|
|
|
146
158
|
tx.task.complete();
|
|
147
159
|
// TODO: address status.completionCode and status.message
|
|
148
160
|
ctx.result = lrp_watcher_utils_1.LrpWatcherUtils.resultFromStatusMessage(status);
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
}
|
|
156
|
-
else {
|
|
157
|
-
resolve();
|
|
158
|
-
}
|
|
159
|
-
}, 1000);
|
|
161
|
+
if (ctx.result.error) {
|
|
162
|
+
reject(ctx.result.error);
|
|
163
|
+
}
|
|
164
|
+
else {
|
|
165
|
+
resolve();
|
|
166
|
+
}
|
|
160
167
|
}
|
|
161
168
|
else {
|
|
162
169
|
if (status.message != undefined && !_.isEmpty(status.message)) {
|
|
@@ -169,6 +176,13 @@ let LrpWatcherPredef = class LrpWatcherPredef {
|
|
|
169
176
|
}
|
|
170
177
|
};
|
|
171
178
|
this.qmgr.subscribeTo(relayTask.opCode, msgHandler); // promise resolutions are within the handler ^ above.
|
|
179
|
+
// Render inline progress messages published by the relay during this task's execution.
|
|
180
|
+
this.qmgr.subscribeTo(lrp_watcher_utils_1.LrpWatcherUtils.WORK_UNIT_OP_STATUS_TYPE, (statusMsg) => {
|
|
181
|
+
const payload = statusMsg.payload;
|
|
182
|
+
if (payload === null || payload === void 0 ? void 0 : payload.message) {
|
|
183
|
+
tx.output = payload.message;
|
|
184
|
+
}
|
|
185
|
+
});
|
|
172
186
|
}));
|
|
173
187
|
});
|
|
174
188
|
return leafHandler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lrp-watcher-predef.js","sourceRoot":"","sources":["../../src/uilogic/lrp-watcher-predef.ts"],"names":[],"mappings":";;;;AAAA,yCAA+C;AAC/C,mCAAgI;AAChI,4DAAqE;AACrE,kEAA4D;AAC5D,4DAA8F;AAC9F,+EAAqE;AACrE,4BAA6B;AAC7B,2DAAuF;AAEvF,gCAAwC;AAExC,oGAAmG;AACnG,qDAAuC;AAGvC;;;;;GAKG;AAEI,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAE3B,YACmD,SAA2B,EAClC,MAAqB;QADd,cAAS,GAAT,SAAS,CAAkB;QAClC,WAAM,GAAN,MAAM,CAAe;QAE/D,IAAI,CAAC,IAAI,GAAG,IAAI,kCAAY,EAAE,CAAC;IACjC,CAAC;
|
|
1
|
+
{"version":3,"file":"lrp-watcher-predef.js","sourceRoot":"","sources":["../../src/uilogic/lrp-watcher-predef.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,5 +12,7 @@ export type StatusViewContext<TResult extends Result> = {
|
|
|
12
12
|
export declare abstract class LrpWatcherUtils {
|
|
13
13
|
/** The value of the `action` field in a SocketAction for status messages. */
|
|
14
14
|
static readonly STATUS_MSG_TYPE = "operationStatus";
|
|
15
|
+
/** The event name for inline progress messages published within a work unit's execution. */
|
|
16
|
+
static readonly WORK_UNIT_OP_STATUS_TYPE = "workUnitOpStatus";
|
|
15
17
|
static resultFromStatusMessage(status: OperationStatus): Result;
|
|
16
18
|
}
|
|
@@ -27,4 +27,6 @@ class LrpWatcherUtils {
|
|
|
27
27
|
exports.LrpWatcherUtils = LrpWatcherUtils;
|
|
28
28
|
/** The value of the `action` field in a SocketAction for status messages. */
|
|
29
29
|
LrpWatcherUtils.STATUS_MSG_TYPE = "operationStatus";
|
|
30
|
+
/** The event name for inline progress messages published within a work unit's execution. */
|
|
31
|
+
LrpWatcherUtils.WORK_UNIT_OP_STATUS_TYPE = "workUnitOpStatus";
|
|
30
32
|
//# sourceMappingURL=lrp-watcher-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lrp-watcher-utils.js","sourceRoot":"","sources":["../../src/uilogic/lrp-watcher-utils.ts"],"names":[],"mappings":";;;AAAA,kEAA0E;AAC1E,4DAA8F;AAW9F,wCAAwC;AACxC,MAAsB,eAAe;
|
|
1
|
+
{"version":3,"file":"lrp-watcher-utils.js","sourceRoot":"","sources":["../../src/uilogic/lrp-watcher-utils.ts"],"names":[],"mappings":";;;AAAA,kEAA0E;AAC1E,4DAA8F;AAW9F,wCAAwC;AACxC,MAAsB,eAAe;IAS5B,MAAM,CAAC,uBAAuB,CAAC,MAAuB;;QAC3D,IAAI,MAAM,GAAG,IAAI,kBAAM,CAAC,KAAK,CAAC,CAAC;QAE/B,UAAU;QACV,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,cAAc,IAAI,+CAA2B,CAAC,OAAO,CAAC,CAAC;QACvF,UAAU;QACV,IAAI,MAAM,CAAC,cAAc,IAAI,+CAA2B,CAAC,OAAO,EAAE;YAChE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAA,MAAM,CAAC,cAAc,mCAAI,EAAE,EAAE,IAAI,EAAE,MAAA,MAAM,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;SAC/G;aAAM,IAAI,MAAM,CAAC,OAAO,EAAE;YACzB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;SACjC;QACD,QAAQ;QACR,IAAI,MAAM,CAAC,cAAc,IAAI,+CAA2B,CAAC,MAAM,EAAE;YAC/D,MAAM,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SAC1C;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;;AA1BH,0CA6BC;AA3BC,6EAA6E;AACtD,+BAAe,GAAG,iBAAiB,CAAC;AAE3D,4FAA4F;AACrE,wCAAwB,GAAG,kBAAkB,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { IBetterLogger } from "@codiac.io/codiac-common";
|
|
|
2
2
|
import { AtLeast } from '@codiac.io/codiac-common/contracts';
|
|
3
3
|
import { IOutputStyler, IUserInputProvider } from "../ops";
|
|
4
4
|
import { PromptChoice } from "../cli-common";
|
|
5
|
-
import { RootMap, EnterpriseRoot, EnvironmentRoot, CabinetClusterRoot, AssetTypesEnum, ClusterWithIngress, Asset } from "../apis/codiac-api/contracts";
|
|
5
|
+
import { RootMap, EnterpriseRoot, EnvironmentRoot, CabinetClusterRoot, AssetTypesEnum, ClusterWithIngress, Asset, ClusterDef, CloudProviderEnum } from "../apis/codiac-api/contracts";
|
|
6
6
|
export type TextValueParent = {
|
|
7
7
|
text: string;
|
|
8
8
|
value: string;
|
|
@@ -21,6 +21,9 @@ export interface IEnviroClusterTreeEmbellisher extends IEnviroTreeEmbellisher {
|
|
|
21
21
|
export interface ICabinetTreeEmbellisher extends IEnviroTreeEmbellisher {
|
|
22
22
|
eachCabinet: (cabBranch: TextValueParent, cab: CabinetClusterRoot, env: EnvironmentRoot, ent: EnterpriseRoot, rootMap: RootMap) => void;
|
|
23
23
|
}
|
|
24
|
+
/** Minimal projection of a ClusterDef used for cluster-selection prompts. */
|
|
25
|
+
export interface IClusterDescriptor extends AtLeast<ClusterDef, "id" | "name" | "provider" | "locationName" | "instance" | "modified" | "modifiedBy" | "thisMachine"> {
|
|
26
|
+
}
|
|
24
27
|
/** Full designation of an environment and a cluster included in it. */
|
|
25
28
|
export type IEnviroClusterPair = {
|
|
26
29
|
enterprise: string;
|
|
@@ -72,6 +75,20 @@ export declare class RootMapUiUtils {
|
|
|
72
75
|
promptForEnviro(rootMap: RootMap, enterprise?: string, defaultEnviro?: string, takeDefaults?: boolean): Promise<EnvironmentRoot>;
|
|
73
76
|
/** */
|
|
74
77
|
promptForEnviroCluster(rootMap: RootMap, enterpriseCode?: string, defaultEnviro?: string, defaultCluster?: string, takeDefaults?: boolean): Promise<[EnvironmentRoot, ClusterWithIngress]>;
|
|
78
|
+
/** Renders a user-friendly cluster description: `name (provider, locationName)`. */
|
|
79
|
+
describeCluster(cluster: {
|
|
80
|
+
name: string;
|
|
81
|
+
provider: CloudProviderEnum;
|
|
82
|
+
locationName?: string;
|
|
83
|
+
}): string;
|
|
84
|
+
/** Prompts the user to select a cluster from the given list.
|
|
85
|
+
*
|
|
86
|
+
* @param clusters Pre-filtered list of clusters to offer as choices.
|
|
87
|
+
* @param defaultValue Optional cluster name to pre-select / confirm.
|
|
88
|
+
* @param confirmLabel Label shown in the confirmation prompt (default: "Target Cluster:").
|
|
89
|
+
* Use "Local Cluster:" for commands that operate on the local machine only.
|
|
90
|
+
*/
|
|
91
|
+
promptForCluster(clusters: IClusterDescriptor[], defaultValue?: string, confirmLabel?: string): Promise<IClusterDescriptor>;
|
|
75
92
|
displayForEnv(enviro: EnvironmentRoot, showClusters?: boolean, hilite?: boolean): string;
|
|
76
93
|
displayForEnvCluster(enviro: EnvironmentRoot, cluster: ClusterWithIngress): string;
|
|
77
94
|
/** Selects a unique "enterprise|enviro|cluster?".
|
|
@@ -414,6 +414,36 @@ let RootMapUiUtils = class RootMapUiUtils {
|
|
|
414
414
|
return [enviro, cluster];
|
|
415
415
|
});
|
|
416
416
|
}
|
|
417
|
+
/** Renders a user-friendly cluster description: `name (provider, locationName)`. */
|
|
418
|
+
describeCluster(cluster) {
|
|
419
|
+
return `${cluster.name} ${this.styler.dim("(" + cluster.provider + (cluster.locationName ? ", " + cluster.locationName : "") + ")")}`;
|
|
420
|
+
}
|
|
421
|
+
/** Prompts the user to select a cluster from the given list.
|
|
422
|
+
*
|
|
423
|
+
* @param clusters Pre-filtered list of clusters to offer as choices.
|
|
424
|
+
* @param defaultValue Optional cluster name to pre-select / confirm.
|
|
425
|
+
* @param confirmLabel Label shown in the confirmation prompt (default: "Target Cluster:").
|
|
426
|
+
* Use "Local Cluster:" for commands that operate on the local machine only.
|
|
427
|
+
*/
|
|
428
|
+
promptForCluster(clusters, defaultValue, confirmLabel = "Target Cluster:") {
|
|
429
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
430
|
+
const selectLabel = `Select the ${confirmLabel.toLowerCase().replace(/:$/, "")}:`;
|
|
431
|
+
let output;
|
|
432
|
+
let keep = false;
|
|
433
|
+
if (defaultValue && clusters.find(c => c.name === defaultValue)) {
|
|
434
|
+
keep = yield this._ui.promptConfirm("clusterNameConfirm", `${confirmLabel} [${this.styler.hilite(defaultValue)}]`, true);
|
|
435
|
+
}
|
|
436
|
+
if (keep === true) {
|
|
437
|
+
output = clusters.find(c => c.name === defaultValue);
|
|
438
|
+
}
|
|
439
|
+
else {
|
|
440
|
+
const choices = clusters.map(c => ({ name: this.describeCluster(c), value: c.name }));
|
|
441
|
+
const selectedName = (yield this._ui.promptSelect("clusterName", selectLabel, choices));
|
|
442
|
+
output = clusters.find(c => c.name === selectedName);
|
|
443
|
+
}
|
|
444
|
+
return output;
|
|
445
|
+
});
|
|
446
|
+
}
|
|
417
447
|
displayForEnv(enviro, showClusters = true, hilite = true) {
|
|
418
448
|
let display = hilite ? this.styler.hilite(enviro.name) : enviro.name;
|
|
419
449
|
// assemble cluster desc
|