@codiac.io/codiac-cli 1.3.38 → 1.3.40
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-relay/gen/client.d.ts +4 -4
- package/dist/apis/codiac-relay/gen/client.js +2 -2
- package/dist/apis/codiac-relay/gen/client.js.map +1 -1
- package/dist/apis/codiac-relay/gen/contracts.d.ts +19 -0
- package/dist/apis/codiac-relay/gen/contracts.js.map +1 -1
- package/dist/apis/nats/nats-client.d.ts +7 -2
- package/dist/apis/nats/nats-client.js +33 -13
- package/dist/apis/nats/nats-client.js.map +1 -1
- package/dist/command-base-enterprise.js +1 -1
- package/dist/command-base-enterprise.js.map +1 -1
- package/dist/commands/asset/deploy.js +5 -4
- package/dist/commands/asset/deploy.js.map +1 -1
- package/dist/commands/asset/view.js +1 -1
- package/dist/commands/asset/view.js.map +1 -1
- package/dist/commands/cabinet/create.js +1 -1
- package/dist/commands/cabinet/create.js.map +1 -1
- package/dist/commands/csp/login.js +7 -2
- package/dist/commands/csp/login.js.map +1 -1
- package/dist/commands/deploy.js +4 -3
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/filestore/capture.js +7 -7
- package/dist/commands/filestore/capture.js.map +1 -1
- package/dist/commands/noc/cluster/create.js +5 -1
- package/dist/commands/noc/cluster/create.js.map +1 -1
- package/dist/commands/noc/cluster/deinit.js +9 -7
- package/dist/commands/noc/cluster/deinit.js.map +1 -1
- package/dist/commands/noc/cluster/destroy.js +8 -6
- package/dist/commands/noc/cluster/destroy.js.map +1 -1
- package/dist/commands/noc/cluster/grant.js +1 -1
- package/dist/commands/noc/cluster/grant.js.map +1 -1
- package/dist/commands/noc/cluster/init.js +8 -6
- package/dist/commands/noc/cluster/init.js.map +1 -1
- package/dist/commands/noc/cluster/recreate.js +2 -2
- package/dist/commands/noc/cluster/recreate.js.map +1 -1
- package/dist/commands/secretStore/capture.js +17 -1
- package/dist/commands/secretStore/capture.js.map +1 -1
- package/dist/relay/relay-container.d.ts +1 -0
- package/dist/relay/relay-container.js +49 -19
- package/dist/relay/relay-container.js.map +1 -1
- package/dist/uilogic/cloud-provider-contextualizer.d.ts +9 -1
- package/dist/uilogic/cloud-provider-contextualizer.js +66 -27
- package/dist/uilogic/cloud-provider-contextualizer.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/aws-resource-configurator.d.ts +4 -4
- package/dist/uilogic/cloud-resource-configurators/aws-resource-configurator.js +56 -34
- package/dist/uilogic/cloud-resource-configurators/aws-resource-configurator.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/az-interactive-login-configurator.d.ts +2 -1
- package/dist/uilogic/cloud-resource-configurators/az-interactive-login-configurator.js +9 -2
- package/dist/uilogic/cloud-resource-configurators/az-interactive-login-configurator.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/azure-resource-configurator.d.ts +8 -0
- package/dist/uilogic/cloud-resource-configurators/azure-resource-configurator.js +40 -31
- package/dist/uilogic/cloud-resource-configurators/azure-resource-configurator.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/docker-hub-resource-configurator.d.ts +5 -4
- package/dist/uilogic/cloud-resource-configurators/docker-hub-resource-configurator.js +13 -6
- package/dist/uilogic/cloud-resource-configurators/docker-hub-resource-configurator.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/helm-resource-configurator.d.ts +5 -4
- package/dist/uilogic/cloud-resource-configurators/helm-resource-configurator.js +20 -11
- package/dist/uilogic/cloud-resource-configurators/helm-resource-configurator.js.map +1 -1
- package/dist/uilogic/i-login-configurator.d.ts +2 -1
- package/dist/uilogic/i-registry-configurator.d.ts +1 -1
- package/dist/uilogic/image-registry-contextualizer.js +5 -7
- package/dist/uilogic/image-registry-contextualizer.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +1 -1
|
@@ -100,7 +100,7 @@ class NocClusterRecreate extends command_base_enterprise_1.CommandBaseEnterprise
|
|
|
100
100
|
// TODO: ask to change before prompting the list
|
|
101
101
|
let allPvds = this.cspUiFactory.getAllProviders(this.ioc);
|
|
102
102
|
newClusterDef.provider = yield this.uiCloudPvd.promptForCloudProvider(allPvds, newClusterDef.provider);
|
|
103
|
-
yield this.uiCloudPvd.promptForCloudProviderCreds(this.ioc, newClusterDef.provider);
|
|
103
|
+
yield this.uiCloudPvd.promptForCloudProviderCreds(this.ioc, newClusterDef.provider, undefined, undefined, undefined, newClusterDef.providerSubscription);
|
|
104
104
|
// load up the cluster configurator for the given clouduprovider
|
|
105
105
|
let regCfg = this.cspUiFactory.create(newClusterDef.provider, this.ioc);
|
|
106
106
|
let def = yield regCfg.defineCluster(newClusterDef, defaults); // note: "defaults" gets mutated here
|
|
@@ -120,7 +120,7 @@ class NocClusterRecreate extends command_base_enterprise_1.CommandBaseEnterprise
|
|
|
120
120
|
this._ui.userMessage(`codiac noc:cluster:recreate ${newClusterDef.name} -p ${newClusterDef.privateOwner} -s ${newClusterDef.providerSubscription} -g '${newClusterDef.providerGroup}' -l ${newClusterDef.locationName} -n ${newClusterDef.nodeSpec} -q ${newClusterDef.startingNodeCount} -k ${newClusterDef.subnet} ${(flags.windowsSupport) ? '-w' : ''} ${(flags.silent) ? '-y ' + flags.silent : ''}`);
|
|
121
121
|
}
|
|
122
122
|
else {
|
|
123
|
-
yield this.cspContextualizer.promptForCloudProviderCreds(this.ioc, existing.provider);
|
|
123
|
+
yield this.cspContextualizer.promptForCloudProviderCreds(this.ioc, existing.provider, undefined, undefined, undefined, existing.providerSubscription);
|
|
124
124
|
// tear down existing cluster
|
|
125
125
|
this._ui.startSpinner(`Tearing down existing cluster instance [${existing.name}]...`);
|
|
126
126
|
let teardownResult = yield this.genRelayClient.Call.postExecuteDeleteClusterInstance({ name: existing.name, deleteIdentity: false });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recreate.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/recreate.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"recreate.js","sourceRoot":"","sources":["../../../../src/commands/noc/cluster/recreate.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,6 +87,7 @@ class SecretStoreCapture extends command_base_enterprise_1.CommandBaseEnterprise
|
|
|
87
87
|
}
|
|
88
88
|
/** Walks the user through a Q & A to build out the specs for the asset. */
|
|
89
89
|
buildCandidate_interactively(partial, alreadyCaptured) {
|
|
90
|
+
var _a;
|
|
90
91
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
91
92
|
try {
|
|
92
93
|
let candidate;
|
|
@@ -104,7 +105,22 @@ class SecretStoreCapture extends command_base_enterprise_1.CommandBaseEnterprise
|
|
|
104
105
|
// let choices = await this.relayClient.getAllSecretProviders();
|
|
105
106
|
partial.provider = (yield this.uiCloudProvider.promptForCloudProvider(choices, partial.provider));
|
|
106
107
|
// 2. Authenticate with the cloud resource provider
|
|
107
|
-
|
|
108
|
+
let subx = (_a = partial.accountId) !== null && _a !== void 0 ? _a : partial.subscriptionId;
|
|
109
|
+
let cspUser = yield this.uiCloudProvider.promptForCloudProviderCreds(this.ioc, partial.provider, undefined, undefined, undefined, subx);
|
|
110
|
+
if (cspUser.subscriptionId) {
|
|
111
|
+
switch (partial.provider) {
|
|
112
|
+
case codiac_domain_1.CloudProviderEnum.aws:
|
|
113
|
+
partial.accountId = cspUser.subscriptionId;
|
|
114
|
+
break;
|
|
115
|
+
case codiac_domain_1.CloudProviderEnum.azure:
|
|
116
|
+
partial.subscriptionId = cspUser.subscriptionId;
|
|
117
|
+
break;
|
|
118
|
+
default:
|
|
119
|
+
partial.subscriptionId = cspUser.subscriptionId;
|
|
120
|
+
break;
|
|
121
|
+
// TODO: Add the subscriptionId property to the SecretStoreDef domain entity.
|
|
122
|
+
}
|
|
123
|
+
}
|
|
108
124
|
// 3. Select an existing secret store
|
|
109
125
|
let cfg8r = factory.create(partial.provider, this.ioc);
|
|
110
126
|
// let provisionerFactory = this.ioc.get(ProvisionerFactory);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../../src/commands/secretStore/capture.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../../src/commands/secretStore/capture.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,7 @@ export declare class RelayContainer implements IContainerServiceClient {
|
|
|
29
29
|
get ready$(): Observable<boolean>;
|
|
30
30
|
constructor(styler: IOutputStyler, logger: IBetterLogger, healthCheckUrl?: string, retryTimeOut?: number, projectRoot?: string | undefined);
|
|
31
31
|
private init;
|
|
32
|
+
private getAllContainersOfRelayImage;
|
|
32
33
|
private getRelayImageFromDockerPS;
|
|
33
34
|
private getRunningContainers;
|
|
34
35
|
private versionMismatch;
|
|
@@ -14,7 +14,7 @@ const cli_tools_1 = require("@codiac.io/cli-tools");
|
|
|
14
14
|
const INTERFACES_CLI_1 = require("../ops/INTERFACES_CLI");
|
|
15
15
|
const Docker = require("dockerode");
|
|
16
16
|
const DEFAULT_IMAGE_NAME = "codiacimages/codiac-relay";
|
|
17
|
-
const DEFAULT_IMAGE_TAG = "1.4.
|
|
17
|
+
const DEFAULT_IMAGE_TAG = "1.4.14";
|
|
18
18
|
const DEFAULT_CONTAINER_NAME = "codiac-relay";
|
|
19
19
|
const DEFAULT_HEALTH_CHECK_URL = "http://localhost:5799/heartbeat-json"; // /ready-state";
|
|
20
20
|
const DEFAULT_RETRY_TIMOUT_IN_MINUTES = 1;
|
|
@@ -128,6 +128,37 @@ let RelayContainer = class RelayContainer {
|
|
|
128
128
|
}))
|
|
129
129
|
.subscribe();
|
|
130
130
|
}
|
|
131
|
+
getAllContainersOfRelayImage() {
|
|
132
|
+
const command = `docker ps -a | grep -v ID`;
|
|
133
|
+
const output = new rxjs_1.Subject();
|
|
134
|
+
this._cliExec.execAsyncStdOut(command, { cwd: this.projectRoot }, IBetterLogger_1.LogLevel.debug, true)
|
|
135
|
+
.then((stdout) => {
|
|
136
|
+
this.logger.debug(`getRelayImageFromDockerPS - entered method`);
|
|
137
|
+
// Split the output into lines and parse each line as JSON
|
|
138
|
+
try {
|
|
139
|
+
if (stdout == undefined && stdout == "")
|
|
140
|
+
output.next(undefined);
|
|
141
|
+
else {
|
|
142
|
+
const listedContainers = stdout.split("\n");
|
|
143
|
+
let containerIds = [];
|
|
144
|
+
listedContainers.forEach(r => {
|
|
145
|
+
if (r.split(" ")[1].includes(this.imageName))
|
|
146
|
+
containerIds.push(r.split(" ")[0]);
|
|
147
|
+
});
|
|
148
|
+
output.next(containerIds);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
catch (parseError) {
|
|
152
|
+
this.logger.error(`getRelayImageFromDockerPS - Error parsing Docker output: ${parseError}`);
|
|
153
|
+
return parseError;
|
|
154
|
+
}
|
|
155
|
+
})
|
|
156
|
+
.catch(error => {
|
|
157
|
+
this.logger.debug(`getRelayImageFromDockerPS - Command failed: docker ps -a | grep -v ID`);
|
|
158
|
+
output.next(undefined);
|
|
159
|
+
});
|
|
160
|
+
return output.asObservable();
|
|
161
|
+
}
|
|
131
162
|
getRelayImageFromDockerPS() {
|
|
132
163
|
const command = `docker ps -a | grep -v ID`;
|
|
133
164
|
const output = new rxjs_1.Subject();
|
|
@@ -330,25 +361,24 @@ let RelayContainer = class RelayContainer {
|
|
|
330
361
|
}
|
|
331
362
|
remove() {
|
|
332
363
|
// fire off this command in a separate cli window
|
|
333
|
-
|
|
364
|
+
this.getAllContainersOfRelayImage().pipe((0, operators_1.map)(response => {
|
|
365
|
+
if (response && response.length > 0) {
|
|
366
|
+
response.forEach(containerId => {
|
|
367
|
+
let cmdStop = `docker rm ${containerId} -f`;
|
|
368
|
+
let options = {
|
|
369
|
+
cwd: this.projectRoot,
|
|
370
|
+
shell: true
|
|
371
|
+
};
|
|
372
|
+
const ls = (0, child_process_1.spawn)(cmdStop, options);
|
|
373
|
+
ls.on('close', (data) => {
|
|
374
|
+
result$.next(false);
|
|
375
|
+
});
|
|
376
|
+
});
|
|
377
|
+
}
|
|
378
|
+
}))
|
|
379
|
+
.subscribe();
|
|
334
380
|
let result$ = new rxjs_1.Subject();
|
|
335
381
|
result$.subscribe();
|
|
336
|
-
let options = {
|
|
337
|
-
cwd: this.projectRoot,
|
|
338
|
-
// stdio: "inherit",
|
|
339
|
-
// stdio: [process.stdin, process.stdout, process.stderr, process.st], // TODO: Capture stderr instead
|
|
340
|
-
shell: true
|
|
341
|
-
};
|
|
342
|
-
const ls = (0, child_process_1.spawn)(cmdStop, options);
|
|
343
|
-
// ls.stdout?.on('data', (data: any) => {
|
|
344
|
-
// result$.next(true);
|
|
345
|
-
// });
|
|
346
|
-
// ls.stdout?.on('error', (data: any) => {
|
|
347
|
-
// result$.next(false);
|
|
348
|
-
// });
|
|
349
|
-
ls.on('close', (data) => {
|
|
350
|
-
result$.next(false);
|
|
351
|
-
});
|
|
352
382
|
return result$.asObservable();
|
|
353
383
|
}
|
|
354
384
|
destroy() {
|
|
@@ -444,7 +474,7 @@ let RelayContainer = class RelayContainer {
|
|
|
444
474
|
execStart() {
|
|
445
475
|
this.docker.getContainer(this.containerName).start().then(container => {
|
|
446
476
|
this._userMessages.next(`Starting Relay...`);
|
|
447
|
-
|
|
477
|
+
this.dockerSetRelayRestart().pipe((0, operators_1.map)(_ => this.healthCheck())).subscribe();
|
|
448
478
|
this.logger.debug(`execStart - Container ${container.id} started`);
|
|
449
479
|
})
|
|
450
480
|
.catch(error => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay-container.js","sourceRoot":"","sources":["../../src/relay/relay-container.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"relay-container.js","sourceRoot":"","sources":["../../src/relay/relay-container.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { CloudProviderEnum } from "@codiac.io/codiac-domain";
|
|
|
3
3
|
import { RelayClient as GenRelayClient } from "../apis/codiac-relay";
|
|
4
4
|
import { LoginConfiguratorFactory } from "./cloud-resource-configurator-factory";
|
|
5
5
|
import { IOutputStyler, IUserInputProvider } from "../ops";
|
|
6
|
+
import { CloudProviderUser } from "../apis/codiac-relay/contracts";
|
|
6
7
|
/** Prompts the user for a cloud resource provider,
|
|
7
8
|
* their credentials there, attempts a login,
|
|
8
9
|
* and then persists the credentials into the keyring under that tenant and provider.
|
|
@@ -20,6 +21,13 @@ export declare class CloudProviderContextualizer {
|
|
|
20
21
|
private static isBootstrapped;
|
|
21
22
|
static bootstrap(ioc: interfaces.Container): void;
|
|
22
23
|
promptForCloudProvider(allPvds: CloudProviderEnum[], defaultValue: CloudProviderEnum | undefined): Promise<CloudProviderEnum>;
|
|
24
|
+
/** Suffixes the username with its applicable csp subscriptionId
|
|
25
|
+
*
|
|
26
|
+
* as:
|
|
27
|
+
* ```
|
|
28
|
+
* "<username> (<subscriptionId>)"
|
|
29
|
+
* ``` */
|
|
30
|
+
private userAndSubx;
|
|
23
31
|
/** Enables the user to enter, use existing, or change the credentials for the given cloud service provider.
|
|
24
32
|
*
|
|
25
33
|
* Throws on authentication failure of cached creds,
|
|
@@ -32,7 +40,7 @@ export declare class CloudProviderContextualizer {
|
|
|
32
40
|
* @param providerUserName TODO: Remove this argument and rely on relay state (via separate login step).
|
|
33
41
|
* @param providerSecret TODO: Remove this argument and rely on relay state (via separate login step).
|
|
34
42
|
*/
|
|
35
|
-
promptForCloudProviderCreds(ioc: interfaces.Container, providerCode: CloudProviderEnum, suppressConfirmations?: boolean, providerUserName?: string, providerSecret?: string): Promise<
|
|
43
|
+
promptForCloudProviderCreds(ioc: interfaces.Container, providerCode: CloudProviderEnum, suppressConfirmations?: boolean, providerUserName?: string, providerSecret?: string, reqSubscriptionId?: string): Promise<CloudProviderUser>;
|
|
36
44
|
/** Signs the user out from the given cloud service provider.
|
|
37
45
|
*
|
|
38
46
|
* @returns username
|
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
4
4
|
exports.CloudProviderContextualizer = void 0;
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
6
|
const inversify_1 = require("inversify");
|
|
7
|
+
const codiac_domain_1 = require("@codiac.io/codiac-domain");
|
|
7
8
|
const codiac_relay_1 = require("../apis/codiac-relay");
|
|
8
9
|
const cloud_resource_configurator_factory_1 = require("./cloud-resource-configurator-factory");
|
|
9
10
|
const ops_1 = require("../ops");
|
|
@@ -57,6 +58,15 @@ let CloudProviderContextualizer = CloudProviderContextualizer_1 = class CloudPro
|
|
|
57
58
|
}));
|
|
58
59
|
});
|
|
59
60
|
}
|
|
61
|
+
/** Suffixes the username with its applicable csp subscriptionId
|
|
62
|
+
*
|
|
63
|
+
* as:
|
|
64
|
+
* ```
|
|
65
|
+
* "<username> (<subscriptionId>)"
|
|
66
|
+
* ``` */
|
|
67
|
+
userAndSubx(user) {
|
|
68
|
+
return (user.subscriptionId) ? user.username.concat(" (", user.provider == codiac_domain_1.CloudProviderEnum.aws ? "Acct:" : "Subx:", user.subscriptionId, ")") : user.username;
|
|
69
|
+
}
|
|
60
70
|
/** Enables the user to enter, use existing, or change the credentials for the given cloud service provider.
|
|
61
71
|
*
|
|
62
72
|
* Throws on authentication failure of cached creds,
|
|
@@ -69,36 +79,59 @@ let CloudProviderContextualizer = CloudProviderContextualizer_1 = class CloudPro
|
|
|
69
79
|
* @param providerUserName TODO: Remove this argument and rely on relay state (via separate login step).
|
|
70
80
|
* @param providerSecret TODO: Remove this argument and rely on relay state (via separate login step).
|
|
71
81
|
*/
|
|
72
|
-
promptForCloudProviderCreds(ioc, providerCode, suppressConfirmations, providerUserName, providerSecret) {
|
|
82
|
+
promptForCloudProviderCreds(ioc, providerCode, suppressConfirmations, providerUserName, providerSecret, reqSubscriptionId) {
|
|
73
83
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
74
84
|
return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
75
|
-
var _a;
|
|
85
|
+
var _a, _b;
|
|
76
86
|
let output;
|
|
77
87
|
try {
|
|
78
88
|
// let regUser = await this.relayClient.getCurrentUserFor(providerCode);
|
|
79
|
-
let
|
|
80
|
-
if (
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
//
|
|
89
|
+
let cachedCred;
|
|
90
|
+
// if (providerSubscriptionId) {
|
|
91
|
+
// let userResults = await this.genRelayClient.Call.get_current_users_for({ providerCode: providerCode, providerSubscriptionId: providerSubscriptionId });
|
|
92
|
+
// if (userResults.error) throw userResults.error;
|
|
93
|
+
// regUser = userResults.output ? userResults.output[0] : undefined;
|
|
94
|
+
// } else {
|
|
95
|
+
let userResults = yield this.genRelayClient.Call.get_current_users_for({ providerCode: providerCode, providerSubscriptionId: reqSubscriptionId });
|
|
96
|
+
if (userResults.error)
|
|
97
|
+
throw userResults.error;
|
|
84
98
|
let keep = this.takeDefaults || (suppressConfirmations !== null && suppressConfirmations !== void 0 ? suppressConfirmations : false);
|
|
85
|
-
if (
|
|
86
|
-
|
|
99
|
+
if (userResults.output) {
|
|
100
|
+
if (userResults.output.length == 1) {
|
|
101
|
+
cachedCred = userResults.output[0];
|
|
102
|
+
// 1.a Confirm existing creds
|
|
103
|
+
if (cachedCred !== undefined && (!this.takeDefaults) && (!(suppressConfirmations !== null && suppressConfirmations !== void 0 ? suppressConfirmations : false))) {
|
|
104
|
+
let prompt = `Continue in ${this._styler.hilite(providerCode)} as [${this._styler.hilite(this.userAndSubx(cachedCred))}]?`;
|
|
105
|
+
if (reqSubscriptionId) {
|
|
106
|
+
prompt = "Continue in ".concat(this._styler.hilite(providerCode), " (", providerCode == codiac_domain_1.CloudProviderEnum.aws ? "Acct:" : "Subx:", this._styler.hilite(reqSubscriptionId), ")", " as [", this._styler.hilite(cachedCred.username), "]?");
|
|
107
|
+
}
|
|
108
|
+
keep = yield this._ui.promptConfirm("reauth", prompt.concat(` (hit "n" to change)`));
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
else if (userResults.output.length > 1) {
|
|
112
|
+
// 1.b Select existing creds
|
|
113
|
+
let index = 0;
|
|
114
|
+
let choices = userResults.output.map(x => { return { name: this.userAndSubx(x), value: index++ }; });
|
|
115
|
+
choices.push({ name: "** enter new credentials **", value: -1 });
|
|
116
|
+
const selected = (yield this._ui.promptSelect("cspSubxUser", `Select ${providerCode} credentials`, choices));
|
|
117
|
+
if (selected >= 0) {
|
|
118
|
+
cachedCred = userResults.output[selected];
|
|
119
|
+
keep = true;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
87
122
|
}
|
|
123
|
+
// }
|
|
88
124
|
// 2. Attempt auth with existing creds
|
|
89
125
|
let isAuthed = false;
|
|
90
|
-
if (keep === true) {
|
|
91
|
-
output = { username: regUser };
|
|
126
|
+
if (cachedCred && keep === true) {
|
|
92
127
|
this._ui.startSpinner(`Authenticating with ${providerCode}...`);
|
|
93
128
|
try {
|
|
94
|
-
|
|
95
|
-
// /* TODO: Use this instead of the relay client call above ^ */
|
|
96
|
-
const loginResult = yield this.genRelayClient.Call.csp_login({ providerCode: providerCode }); // We already have creds, but let's validate with the service anyway (az cli is the only one who needs this bc it runs off a machine-user state and has to set the state on the local machine).
|
|
129
|
+
const loginResult = yield this.genRelayClient.Call.csp_login({ providerCode: providerCode, providerSubscription: cachedCred.subscriptionId }); // We already have creds, but let's validate with the service anyway (az cli is the only one who needs this bc it runs off a machine-user state and has to set the state on the local machine).
|
|
97
130
|
if (loginResult.error)
|
|
98
131
|
throw loginResult.error;
|
|
99
132
|
if (loginResult.output == undefined)
|
|
100
133
|
throw new Error(`Login failed ${(_a = loginResult.message) !== null && _a !== void 0 ? _a : "[no details provided]"}`);
|
|
101
|
-
output
|
|
134
|
+
output = loginResult.output.cspUser;
|
|
102
135
|
this._ui.stopSpinner(`Success!`);
|
|
103
136
|
isAuthed = true;
|
|
104
137
|
}
|
|
@@ -113,18 +146,15 @@ let CloudProviderContextualizer = CloudProviderContextualizer_1 = class CloudPro
|
|
|
113
146
|
// 3. If reqd, Log in interactively
|
|
114
147
|
if (!isAuthed) {
|
|
115
148
|
let loginUi = this.loginUiFactory.create(providerCode, ioc);
|
|
116
|
-
let
|
|
149
|
+
let cspUser;
|
|
117
150
|
// if (suppressConfirmations)
|
|
118
|
-
|
|
151
|
+
let subx = (_b = cachedCred === null || cachedCred === void 0 ? void 0 : cachedCred.subscriptionId) !== null && _b !== void 0 ? _b : reqSubscriptionId;
|
|
152
|
+
[isAuthed, cspUser] = yield loginUi.promptToLogin(subx, suppressConfirmations, providerUserName, providerSecret);
|
|
119
153
|
if (!isAuthed)
|
|
120
|
-
throw new Error(`Login to ${providerCode} failed${providerUserName ? " for " + providerUserName : ""}.`);
|
|
121
|
-
|
|
122
|
-
// loginUi = this.loginUiFactory.create(providerCode, ioc);
|
|
123
|
-
// [isAuthed, userName] = await loginUi.promptToLogin(undefined, suppressConfirmations, providedUserName, providedSecret);
|
|
124
|
-
// }
|
|
125
|
-
output = { username: userName }; // assertion operator ok; logic forces it.
|
|
154
|
+
throw new Error(`Login to ${providerCode} failed${providerUserName ? " for " + providerUserName : ""} ${subx ? " (subx:" + subx + ")" : ""}.`);
|
|
155
|
+
output = cspUser;
|
|
126
156
|
}
|
|
127
|
-
resolve(output
|
|
157
|
+
resolve(output); // assertion operator ok bc logic forces output to be defined.
|
|
128
158
|
}
|
|
129
159
|
catch (err) {
|
|
130
160
|
// this.logger.error(`${err.name ?? ''} ${err.message ?? ''}`, err.stack);
|
|
@@ -146,8 +176,17 @@ let CloudProviderContextualizer = CloudProviderContextualizer_1 = class CloudPro
|
|
|
146
176
|
var _a, _b, _c;
|
|
147
177
|
let output;
|
|
148
178
|
try {
|
|
149
|
-
|
|
150
|
-
|
|
179
|
+
let regUsers = yield this.genRelayClient.Call.get_current_users_for({ providerCode: providerCode });
|
|
180
|
+
let regUser;
|
|
181
|
+
if (regUsers.output && (regUsers.output.length > 0)) {
|
|
182
|
+
if (regUsers.output.length == 1) {
|
|
183
|
+
regUser = regUsers.output[0];
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
// TODO: Consider selecting one of the many
|
|
187
|
+
regUser = regUsers.output[0];
|
|
188
|
+
}
|
|
189
|
+
}
|
|
151
190
|
// // 1. Confirm existing creds
|
|
152
191
|
// let keep = this.takeDefaults || (suppressConfirmations ?? false);
|
|
153
192
|
// if (regUser !== undefined && (!this.takeDefaults) && (!(suppressConfirmations ?? false))) {
|
|
@@ -166,7 +205,7 @@ let CloudProviderContextualizer = CloudProviderContextualizer_1 = class CloudPro
|
|
|
166
205
|
// loginUi = this.loginUiFactory.create(providerCode, ioc);
|
|
167
206
|
// [isAuthed, userName] = await loginUi.promptToLogin(undefined, suppressConfirmations, providedUserName, providedSecret);
|
|
168
207
|
// }
|
|
169
|
-
output = { username: (_c = userName !== null && userName !== void 0 ? userName : regUser) !== null && _c !== void 0 ? _c : "" }; // assertion operator ok; logic forces it.
|
|
208
|
+
output = { username: (_c = userName !== null && userName !== void 0 ? userName : regUser === null || regUser === void 0 ? void 0 : regUser.username) !== null && _c !== void 0 ? _c : "" }; // assertion operator ok; logic forces it.
|
|
170
209
|
resolve(output.username); // operator ok bc logic forces output to be defined.
|
|
171
210
|
}
|
|
172
211
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-provider-contextualizer.js","sourceRoot":"","sources":["../../src/uilogic/cloud-provider-contextualizer.ts"],"names":[],"mappings":";;;;;AAAA,yCAA2D;
|
|
1
|
+
{"version":3,"file":"cloud-provider-contextualizer.js","sourceRoot":"","sources":["../../src/uilogic/cloud-provider-contextualizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { RelayClient as GenRelayClient } from "../../apis/codiac-relay";
|
|
|
7
7
|
import { ILoginConfigurator } from "../i-login-configurator";
|
|
8
8
|
import { ISecretStoreConfigurator } from "../i-secret-store-configurator";
|
|
9
9
|
import { AwsSecretStoreDef, SecretStoreDef } from "../../relay/contracts";
|
|
10
|
-
import { AwsIdentity } from "../../apis/codiac-relay/contracts";
|
|
10
|
+
import { AwsIdentity, CloudProviderUser } from "../../apis/codiac-relay/contracts";
|
|
11
11
|
/** Walks the user through the selection of an existing
|
|
12
12
|
* or the declaration of a new image registry.
|
|
13
13
|
*/
|
|
@@ -20,11 +20,11 @@ export declare class AwsResourceConfigurator implements IRegistryConfigurator, I
|
|
|
20
20
|
constructor(genRelayClient: GenRelayClient, codiacUser: UserNameTenantCode, _ui: IUserInputProvider, _styler: IOutputStyler, logger: IBetterLogger);
|
|
21
21
|
readonly cloudProvider = CloudProviderEnum.aws;
|
|
22
22
|
captureSecretStore(defaults?: Partial<AwsSecretStoreDef> | undefined): Promise<SecretStoreDef>;
|
|
23
|
-
promptToLogin(providerAccountId?: string, suppressConfirmations?: boolean, providedUserName?: string, providedSecret?: string): Promise<[boolean,
|
|
23
|
+
promptToLogin(providerAccountId?: string, suppressConfirmations?: boolean, providedUserName?: string, providedSecret?: string, providedSessionToken?: string): Promise<[boolean, CloudProviderUser]>;
|
|
24
24
|
promptToLogout(): Promise<[boolean, string]>;
|
|
25
25
|
/** Returns undefined for invalid creds. */
|
|
26
|
-
getAwsUserInfo(): Promise<AwsIdentity | undefined>;
|
|
27
|
-
captureImageRegistry(): Promise<ImageRegistry>;
|
|
26
|
+
getAwsUserInfo(accountId?: string, throwNotFound?: boolean): Promise<AwsIdentity | undefined>;
|
|
27
|
+
captureImageRegistry(accountId?: string): Promise<ImageRegistry>;
|
|
28
28
|
defineCluster(initial: Partial<ClusterDef>, defaults?: Partial<ClusterDef>): Promise<{
|
|
29
29
|
spec: ClusterDef;
|
|
30
30
|
defaults: Partial<ClusterDef>;
|