@codiac.io/codiac-cli 1.3.37 → 1.3.39
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.d.ts +25 -4
- package/dist/commands/cabinet/create.js +142 -96
- 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.js +1 -1
- 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 +66 -2
- package/package.json +1 -1
|
@@ -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>;
|
|
@@ -29,12 +29,7 @@ let AwsResourceConfigurator = class AwsResourceConfigurator {
|
|
|
29
29
|
try {
|
|
30
30
|
let output;
|
|
31
31
|
// const cspUser = await this.relayClient.getCurrentUserFor(this.cloudProvider);
|
|
32
|
-
const
|
|
33
|
-
if (cspUserResult.error)
|
|
34
|
-
throw cspUserResult.error;
|
|
35
|
-
const cspUser = cspUserResult.output;
|
|
36
|
-
if (!cspUser)
|
|
37
|
-
throw new Error(`Cannot capture any ${this.cloudProvider} secret store: No ${this.cloudProvider} account has been authenticated.`);
|
|
32
|
+
const cspUser = (yield this.getAwsUserInfo(defaults === null || defaults === void 0 ? void 0 : defaults.accountId, true));
|
|
38
33
|
let confirm = false;
|
|
39
34
|
while (confirm !== true) {
|
|
40
35
|
let region = yield this.promptForLocation(defaults === null || defaults === void 0 ? void 0 : defaults.region);
|
|
@@ -50,42 +45,68 @@ let AwsResourceConfigurator = class AwsResourceConfigurator {
|
|
|
50
45
|
}
|
|
51
46
|
});
|
|
52
47
|
}
|
|
53
|
-
promptToLogin(providerAccountId, suppressConfirmations, providedUserName, providedSecret) {
|
|
54
|
-
var _a, _b;
|
|
48
|
+
promptToLogin(providerAccountId, suppressConfirmations, providedUserName, providedSecret, providedSessionToken) {
|
|
49
|
+
var _a, _b, _c;
|
|
55
50
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
56
51
|
try {
|
|
57
52
|
let isAuthed = false;
|
|
58
53
|
let userName = undefined;
|
|
59
54
|
let secret = undefined;
|
|
55
|
+
let sessionToken = undefined;
|
|
56
|
+
let reason;
|
|
60
57
|
if (!suppressConfirmations) {
|
|
61
58
|
this._ui.userMessage(`Enter your credentials for ${this._styler.hilite(this.cloudProvider)}`);
|
|
62
59
|
userName = yield this._ui.prompt('regUsername', "Access Key Id:", false);
|
|
63
60
|
if (userName === undefined || userName === "")
|
|
64
61
|
userName = "<token>"; // TODO: make username nullable on the authPvd, so this becomes the job of the auth provider
|
|
65
62
|
secret = yield this._ui.promptPassword('regSecret', `Secret Access Key:`);
|
|
63
|
+
let tokenYes = yield this._ui.promptConfirm("keepToken", "Add Session Token? ", false);
|
|
64
|
+
if (tokenYes) {
|
|
65
|
+
sessionToken = yield this._ui.promptPassword('regSessionToken', `Session Token:`);
|
|
66
|
+
}
|
|
66
67
|
}
|
|
67
68
|
else {
|
|
68
69
|
if (!providedUserName || !providedSecret)
|
|
69
70
|
throw new Error("Must provide cloud provider username/pwd to login silent mode");
|
|
70
71
|
userName = providedUserName;
|
|
71
72
|
secret = providedSecret;
|
|
73
|
+
sessionToken = providedSessionToken;
|
|
72
74
|
}
|
|
75
|
+
let cspUser = {
|
|
76
|
+
tenantCode: this.codiacUser.tenantCode,
|
|
77
|
+
provider: this.cloudProvider,
|
|
78
|
+
subscriptionId: providerAccountId,
|
|
79
|
+
username: userName,
|
|
80
|
+
created: new Date(Date.now())
|
|
81
|
+
};
|
|
73
82
|
try {
|
|
74
83
|
this._ui.startSpinner(`Authenticating with ${this.cloudProvider}...`);
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
84
|
+
let authResult = yield this.genRelayClient.Call.csp_login({
|
|
85
|
+
providerCode: this.cloudProvider,
|
|
86
|
+
providerSubscription: providerAccountId,
|
|
87
|
+
username: userName,
|
|
88
|
+
secret: secret
|
|
89
|
+
});
|
|
90
|
+
if (authResult.error != undefined)
|
|
91
|
+
throw authResult.error;
|
|
92
|
+
if (authResult.success != true)
|
|
93
|
+
throw new Error((_a = authResult.message) !== null && _a !== void 0 ? _a : "no details available");
|
|
94
|
+
isAuthed = Boolean(authResult.success == true);
|
|
95
|
+
if (isAuthed == true && authResult.output) {
|
|
96
|
+
cspUser = authResult.output.cspUser; // overwrite with actual
|
|
97
|
+
}
|
|
78
98
|
this._ui.stopSpinner("Success!");
|
|
79
99
|
}
|
|
80
100
|
catch (err) {
|
|
81
|
-
this.logger.debug(`Error authenticating with ${this.cloudProvider}: ${(
|
|
101
|
+
this.logger.debug(`Error authenticating with ${this.cloudProvider}: ${(_b = err.name) !== null && _b !== void 0 ? _b : ""} ${(_c = err.message) !== null && _c !== void 0 ? _c : ""}`);
|
|
102
|
+
reason = err.message;
|
|
82
103
|
this._ui.stopSpinner("Failed.");
|
|
83
104
|
}
|
|
84
105
|
if (isAuthed)
|
|
85
106
|
this._ui.userMessage(`Logged into ${this._styler.hilite(this.cloudProvider)} as [${this._styler.hilite(userName !== null && userName !== void 0 ? userName : "token")}]`);
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
return [isAuthed,
|
|
107
|
+
else if (reason)
|
|
108
|
+
this._ui.userMessage(reason);
|
|
109
|
+
return [isAuthed, cspUser];
|
|
89
110
|
}
|
|
90
111
|
catch (err) {
|
|
91
112
|
throw err;
|
|
@@ -106,26 +127,28 @@ let AwsResourceConfigurator = class AwsResourceConfigurator {
|
|
|
106
127
|
// return accountId;
|
|
107
128
|
// }
|
|
108
129
|
/** Returns undefined for invalid creds. */
|
|
109
|
-
getAwsUserInfo() {
|
|
130
|
+
getAwsUserInfo(accountId, throwNotFound = false) {
|
|
131
|
+
var _a;
|
|
110
132
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
111
|
-
let result = yield this.genRelayClient.Call.getAwsUser({});
|
|
133
|
+
let result = yield this.genRelayClient.Call.getAwsUser({ accountId: accountId }); // <-- TODO: add support for accountId parameter AND return multiples if > 1 applies.
|
|
134
|
+
if (result.error) {
|
|
135
|
+
throw new Error(`Error retrieving ${this.cloudProvider} account: ${(_a = result.message) !== null && _a !== void 0 ? _a : ""} ${result.error.message}.`);
|
|
136
|
+
}
|
|
137
|
+
else if (throwNotFound == true && result.output == undefined) {
|
|
138
|
+
throw new Error(`No ${this.cloudProvider} account has been authenticated.`);
|
|
139
|
+
}
|
|
112
140
|
return result.output;
|
|
113
141
|
});
|
|
114
142
|
}
|
|
115
|
-
captureImageRegistry() {
|
|
143
|
+
captureImageRegistry(accountId) {
|
|
116
144
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
117
145
|
return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
118
|
-
var _a;
|
|
146
|
+
var _a, _b;
|
|
119
147
|
try {
|
|
120
148
|
// let awsUser = await this.relayClient.getCurrentUserFor(this.cloudProvider);
|
|
121
149
|
/* TODO: use this instead */
|
|
122
150
|
// let awsUser = await this.genRelayClient.Call.get_current_user_for({ providerCode: this.cloudProvider });
|
|
123
|
-
let
|
|
124
|
-
if (userResult.error)
|
|
125
|
-
throw new Error(`Cannot capture an aws container registry: Error retrieving ${this.cloudProvider} account: ${(_a = userResult.message) !== null && _a !== void 0 ? _a : ""} ${userResult.error.message}.`);
|
|
126
|
-
let awsUser = userResult.output;
|
|
127
|
-
if (!awsUser)
|
|
128
|
-
throw new Error(`Cannot capture an aws container registry: No ${this.cloudProvider} account has been authenticated.`);
|
|
151
|
+
let awsUser = (yield this.getAwsUserInfo(accountId, true));
|
|
129
152
|
// Get region, default to the one these tokens are for calling out
|
|
130
153
|
// let region = await this._ui.prompt('scope', 'enter the region of the ECR: ', true, registry.scope || defaults.scope);
|
|
131
154
|
let isPrivate = yield this._ui.promptConfirm("regAwsIsPrivate", "Private container registry? (hit 'n' for public) ", true);
|
|
@@ -154,8 +177,9 @@ let AwsResourceConfigurator = class AwsResourceConfigurator {
|
|
|
154
177
|
resolve(registry);
|
|
155
178
|
}
|
|
156
179
|
catch (err) {
|
|
157
|
-
|
|
158
|
-
|
|
180
|
+
let errMsg = "Cannot capture image registry: ".concat((_a = err.name) !== null && _a !== void 0 ? _a : '', " ", (_b = err.message) !== null && _b !== void 0 ? _b : '');
|
|
181
|
+
this.logger.error(errMsg, err.stack);
|
|
182
|
+
reject(new Error(errMsg));
|
|
159
183
|
}
|
|
160
184
|
}));
|
|
161
185
|
});
|
|
@@ -163,7 +187,7 @@ let AwsResourceConfigurator = class AwsResourceConfigurator {
|
|
|
163
187
|
defineCluster(initial, defaults) {
|
|
164
188
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
165
189
|
return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
166
|
-
var _a, _b, _c, _d, _e;
|
|
190
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
167
191
|
let output;
|
|
168
192
|
try {
|
|
169
193
|
const DEFAULT_STARTING_NODE_COUNT = 2;
|
|
@@ -192,10 +216,7 @@ let AwsResourceConfigurator = class AwsResourceConfigurator {
|
|
|
192
216
|
// TODO: Use the method `getIdentityFrom()` from the Codiac AwsAdapter lib to derive this from the Aws primary creds.
|
|
193
217
|
// cluster.providerSubscription = (await this._ui.prompt("providerSubscription", "Aws Account Id (ten-digit code): ", true, initial?.providerSubscription))!;
|
|
194
218
|
// cluster.providerSubscription = await this.promptForAccountId(initial?.providerSubscription);
|
|
195
|
-
let awsUser = yield this.getAwsUserInfo();
|
|
196
|
-
if (awsUser == undefined) {
|
|
197
|
-
throw new Error(`No current user authenticated for AWS.`);
|
|
198
|
-
}
|
|
219
|
+
let awsUser = (yield this.getAwsUserInfo(initial.providerSubscription, true));
|
|
199
220
|
cluster.providerSubscription = awsUser.accountId;
|
|
200
221
|
cluster.providerGroup = "n/a"; // (await this._ui.prompt("providerGroup", "Resource Group: ", true, cluster.providerGroup || cluster.name))!;
|
|
201
222
|
let subnet = (yield this._ui.prompt("subnet", "Subnet: ", false, (_d = initial === null || initial === void 0 ? void 0 : initial.subnet) !== null && _d !== void 0 ? _d : codiac_constants_1.CliConstants.CHOICE_VALUE_FOR_AUTOCREATE));
|
|
@@ -219,8 +240,9 @@ let AwsResourceConfigurator = class AwsResourceConfigurator {
|
|
|
219
240
|
resolve({ spec: spec, defaults: defaults });
|
|
220
241
|
}
|
|
221
242
|
catch (err) {
|
|
222
|
-
|
|
223
|
-
|
|
243
|
+
let errMsg = "Error defining cluster: ".concat((_f = err.name) !== null && _f !== void 0 ? _f : '', " ", (_g = err.message) !== null && _g !== void 0 ? _g : '');
|
|
244
|
+
this.logger.error(errMsg, err.stack);
|
|
245
|
+
reject(new Error(errMsg));
|
|
224
246
|
}
|
|
225
247
|
}));
|
|
226
248
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aws-resource-configurator.js","sourceRoot":"","sources":["../../../src/uilogic/cloud-resource-configurators/aws-resource-configurator.ts"],"names":[],"mappings":";;;;AAAA,yCAA+C;AAC/C,4BAA6B;AAC7B,4DAAiF;AACjF,4EAAgH;AAChH,oEAAkE;AAElE,+DAA+F;AAE/F,0DAAwE;AACxE,6DAAsD;AAGtD,qDAA0F;AAE1F,mCAA2C;AAE3C;;GAEG;AAEI,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAGlC,YACkC,cAA8B,EAC1B,UAA8B,EACf,GAAuB,EAC5B,OAAsB,EAC1B,MAAqB;QAJ/B,mBAAc,GAAd,cAAc,CAAgB;QAC1B,eAAU,GAAV,UAAU,CAAoB;QACf,QAAG,GAAH,GAAG,CAAoB;QAC5B,YAAO,GAAP,OAAO,CAAe;QAC1B,WAAM,GAAN,MAAM,CAAe;QAIjD,kBAAa,GAAG,6BAAiB,CAAC,GAAG,CAAC;IAFtD,CAAC;IAQY,kBAAkB,CAAC,QAAiD;;YAC/E,IAAI;gBACF,IAAI,MAAqC,CAAC;gBAE1C,gFAAgF;gBAChF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;gBACpE,IAAI,aAAa,CAAC,KAAK;oBAAE,MAAM,aAAa,CAAC,KAAK,CAAC;gBACnD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC;gBACrC,IAAI,CAAC,OAAO;oBAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,CAAC,aAAa,qBAAqB,IAAI,CAAC,aAAa,kCAAkC,CAAC,CAAC;gBAEjJ,IAAI,OAAO,GAAG,KAAK,CAAC;gBACpB,OAAO,OAAO,KAAK,IAAI,EAAE;oBACvB,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAC,CAAC;oBAC5D,IAAI,IAAI,GAAG,eAAe,IAAI,CAAC,aAAa,IAAI,OAAO,CAAC,SAAS,IAAI,MAAM,EAAE,CAAC;oBAE9E,IAAI,QAAQ,GAAG,IAAI,0BAAc,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAE,sGAAsG;oBACjL,MAAM,GAAG,IAAI,6BAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;oBAE1E,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,aAAa,EAAE,yBAAyB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBACrH;gBAED,OAAO,MAAO,CAAC;aAChB;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,GAAG,CAAC;aACX;QACH,CAAC;KAAA;IAGY,aAAa,CAAC,iBAA0B,EAAE,qBAA+B,EAAE,gBAAyB,EAAE,cAAuB;;;YACxI,IAAI;gBACF,IAAI,QAAQ,GAAG,KAAK,CAAC;gBACrB,IAAI,QAAQ,GAAG,SAAS,CAAC;gBACzB,IAAI,MAAM,GAAG,SAAS,CAAC;gBACvB,IAAI,CAAC,qBAAqB,EAAE;oBAC1B,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,8BAA8B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;oBAC9F,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAS,aAAa,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;oBACjF,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,EAAE;wBAAE,QAAQ,GAAG,SAAS,CAAC,CAAE,4FAA4F;oBAClK,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAA;iBAC1E;qBACI;oBACH,IAAI,CAAC,gBAAgB,IAAI,CAAC,cAAc;wBACtC,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;oBAEnF,QAAQ,GAAG,gBAAgB,CAAA;oBAC3B,MAAM,GAAG,cAAc,CAAC;iBACzB;gBAED,IAAI;oBACF,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,uBAAuB,IAAI,CAAC,aAAa,KAAK,CAAC,CAAA;oBACrE,4HAA4H;oBAC5H,4BAA4B,CAAC,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;oBACjK,QAAQ,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,uEAAuE;oBACrH,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;iBAClC;gBAAC,OAAO,GAAG,EAAE;oBACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,IAAI,CAAC,aAAa,KAAK,MAAA,GAAG,CAAC,IAAI,mCAAI,EAAE,IAAI,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,EAAE,CAAC,CAAA;oBAC5G,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;iBAChC;gBACD,IAAI,QAAQ;oBAAE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,eAAe,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAAC;gBAE9I,kCAAkC;gBAClC,qFAAqF;gBAErF,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;aAC7B;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,GAAG,CAAC;aACX;;KACF;IAGY,cAAc;;YACzB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACpE,CAAC;KAAA;IAGD,sDAAsD;IACtD,4EAA4E;IAC5E,wEAAwE;IACxE,wFAAwF;IACxF,4EAA4E;IAC5E,2HAA2H;IAC3H,sBAAsB;IACtB,IAAI;IAGJ,2CAA2C;IAC9B,cAAc;;YAEzB,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAC3D,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC;KAAA;IAGY,oBAAoB;;YAC/B,OAAO,IAAI,OAAO,CAAgB,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;;gBAC1D,IAAI;oBAEF,8EAA8E;oBAC9E,4BAA4B;oBAC5B,2GAA2G;oBAC3G,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;oBAC/D,IAAI,UAAU,CAAC,KAAK;wBAAE,MAAM,IAAI,KAAK,CAAC,8DAA8D,IAAI,CAAC,aAAa,aAAa,MAAA,UAAU,CAAC,OAAO,mCAAI,EAAE,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;oBAC5L,IAAI,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC;oBAChC,IAAI,CAAC,OAAO;wBAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,IAAI,CAAC,aAAa,kCAAkC,CAAC,CAAC;oBAEpI,kEAAkE;oBAClE,wHAAwH;oBAExH,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,iBAAiB,EAAE,mDAAmD,EAAE,IAAI,CAAC,CAAC;oBAE3H,kCAAkC;oBAClC,IAAI,QAAuB,CAAC;oBAC5B,IAAI,SAAS,EAAE;wBACb,0CAA0C;wBAC1C,2DAA2D;wBAC3D,sDAAsD;wBACtD,sFAAsF;wBAEtF,uFAAuF;wBACvF,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;wBAEhD,QAAQ,GAAG,IAAI,2CAA0B,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;qBAE1E;yBAAM;wBACL,2CAA2C;wBAC3C,oBAAoB;wBACpB,6EAA6E;wBAC7E,kDAAkD;wBAClD,kCAAkC;wBAClC,wEAAwE;wBACxE,uHAAuH;wBAEvH,IAAI,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAS,OAAO,EAAE,0BAA0B,CAAC,CAAE,CAAC,CAAG,+BAA+B;wBAEpH,QAAQ,GAAG,IAAI,0CAAyB,CAAC,KAAK,CAAC,CAAC;qBACjD;oBAED,OAAO,CAAC,QAAQ,CAAC,CAAC;iBACnB;gBAAC,OAAO,GAAG,EAAE;oBACZ,0EAA0E;oBAC1E,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;YACH,CAAC,CAAA,CAAC,CAAC;QAEL,CAAC;KAAA;IAIY,aAAa,CAAC,OAA4B,EAAE,QAA8B;;YACrF,OAAO,IAAI,OAAO,CAAsD,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;;gBAChG,IAAI,MAA2D,CAAC;gBAChE,IAAI;oBAEF,MAAM,2BAA2B,GAAG,CAAC,CAAC;oBAEtC,IAAI,OAAO,GAAwB,EAAE,CAAC;oBACtC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC;oBACtC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;oBAGlD,8BAA8B;oBAC9B,IAAI,WAAW,GAAG,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,QAAQ,KAAK,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;oBAChG,IAAI,QAAQ,KAAK,SAAS,IAAI,WAAW,EAAE;wBACzC,IAAI,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;wBACxG,IAAI,aAAa,CAAC,KAAK,EAAE;4BACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,IAAI,CAAC,aAAa,aAAa,MAAA,aAAa,CAAC,KAAK,CAAC,IAAI,mCAAI,EAAE,IAAI,MAAA,aAAa,CAAC,KAAK,CAAC,OAAO,mCAAI,EAAE,EAAE,CAAC,CAAA;yBACxJ;wBACD,QAAQ,GAAG,MAAA,aAAa,CAAC,MAAoB,mCAAI,EAAE,CAAC,CAAE,uGAAuG;wBAE7J,IAAI,UAAU,GAAG,CAAC,MAAW,EAAE,MAAW,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;wBAC/F,IAAI,WAAW,EAAE;4BACf,OAAO,GAAG,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,UAAU,CAAC,CAAC,CAAE,+EAA+E;yBACpK;6BAAM;4BACL,OAAO,GAAG,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;yBAC3D;qBACF;oBAGD,sDAAsD;oBACtD,OAAO,CAAC,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,CAAE,CAAC;oBAEvF,OAAO,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC;oBAE3E,sHAAsH;oBACtH,6JAA6J;oBAC7J,+FAA+F;oBAC/F,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;oBAC1C,IAAI,OAAO,IAAI,SAAS,EAAE;wBACxB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;qBAC3D;oBACD,OAAO,CAAC,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;oBAEjD,OAAO,CAAC,aAAa,GAAG,KAAK,CAAA,CAAC,8GAA8G;oBAC5I,IAAI,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,mCAAI,+BAAY,CAAC,2BAA2B,CAAC,CAAC,CAAC;oBAC/H,OAAO,CAAC,MAAM,GAAG,CAAC,MAAM,KAAK,+BAAY,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;oBAE5F,OAAO,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,CAAC,CAAC;oBAEnE,OAAO,CAAC,iBAAiB,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAS,mBAAmB,EAAE,aAAa,EAAE,IAAI,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,mCAAI,2BAA2B,CAAC,CAAE,CAAC;oBAElK,mIAAmI;oBAEnI,OAAO,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAC,CAAC;oBAE/F,IAAI,IAAI,mBACN,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAC1B,oBAAoB,EAAE,OAAO,CAAC,oBAAoB,EAClD,YAAY,EAAE,OAAO,CAAC,YAAY,EAClC,aAAa,EAAE,OAAO,CAAC,aAAa,EACpC,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,UAAU,EAAE,OAAO,CAAC,UAAU,EAC9B,YAAY,EAAE,OAAO,CAAC,YAAY,EAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAC1B,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,EAC5C,YAAY,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IACjC,IAAI,CAAC,eAAe,EAAE,CAC1B,CAAC;oBACF,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;oBACrC,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS;wBAAE,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;oBAC3D,IAAI,OAAO,CAAC,gBAAgB;wBAAE,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;oBAC/E,IAAI,OAAO,CAAC,iBAAiB;wBAAE,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;oBAClF,IAAI,OAAO,CAAC,MAAM;wBAAE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;oBACjD,IAAI,OAAO,CAAC,YAAY;wBAAE,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;oBAEnE,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;iBAC7C;gBAAC,OAAO,GAAG,EAAE;oBACZ,0EAA0E;oBAC1E,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;YACH,CAAC,CAAA,CAAC,CAAC;QACL,CAAC;KAAA;IAIa,iBAAiB,CAAC,YAAqB;;YACnD,IAAI,MAAc,CAAC;YACnB,IAAI;gBAEF,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;gBAC7D,IAAI,GAAG,CAAC,KAAK;oBAAE,MAAM,GAAG,CAAC,KAAK,CAAC;gBAC/B,IAAI,GAAG,CAAC,MAAM,IAAI,SAAS,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;oBAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;gBAChG,IAAI,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAC/C,oGAAoG;gBACpG,IAAI,WAAW,GAAG,KAAK,CAAC;gBACxB,IAAI,YAAY,IAAI,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;oBAC3D,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,cAAc,EAAE,cAAc,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;iBAChH;gBACD,IAAI,WAAW,KAAK,IAAI,IAAI,YAAY,KAAK,SAAS,EAAE;oBACtD,MAAM,GAAG,YAAY,CAAC;iBACvB;qBAAM;oBAEL,IAAI,eAAe,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC/E,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,aAAa,EAAE,eAAe,CAAC,CAAE,CAAC;iBACrF;gBAED,OAAO,MAAM,CAAC;aACf;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,GAAG,CAAC;aACX;QACH,CAAC;KAAA;IAKa,iBAAiB,CAAC,YAAqB;;YACnD,IAAI,MAAc,CAAA;YAClB,IAAI;gBAEF,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBACpE,IAAI,YAAY,CAAC,KAAK;oBAAE,MAAM,YAAY,CAAC,KAAK,CAAC;gBACjD,IAAI,YAAY,CAAC,MAAM,IAAI,SAAS,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;oBAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBACnH,IAAI,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC;gBACrC,IAAI,WAAW,GAAG,KAAK,CAAC;gBACxB,IAAI,YAAY,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,EAAE;oBACjE,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,cAAc,EAAE,aAAa,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;iBAC/G;gBACD,IAAI,WAAW,KAAK,IAAI,IAAI,YAAY,KAAK,SAAS,EAAE;oBACtD,MAAM,GAAG,YAAY,CAAC;iBACvB;qBAAM;oBACL,IAAI,UAAU,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;oBACzD,IAAI,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACzC,IAAI,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,EAAE,aAAa,EAAE,UAAU,CAAC,CAAE,CAAC;oBAC3E,IAAI,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;oBACnD,IAAI,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;oBAClI,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,EAAE,UAAU,EAAE,aAAa,CAAC,CAAE,CAAC;iBACpF;gBAED,OAAO,MAAM,CAAC;aACf;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,GAAG,CAAC;aACX;QACH,CAAC;KAAA;IAID,4FAA4F;IAC9E,mBAAmB,CAAC,QAAgB,EAAE,iBAA0B;;YAC5E,OAAO,IAAI,OAAO,CAAS,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;;gBACnD,IAAI,MAAc,CAAC;gBACnB,IAAI;oBAEF,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;oBAC9H,IAAI,UAAU,CAAC,KAAK;wBAAE,MAAM,UAAU,CAAC,KAAK,CAAC;oBAC7C,IAAI,WAAW,GAAG,MAAA,MAAA,UAAU,CAAC,MAAM,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,mCAAI,EAAE,CAAC;oBAClE,IAAI,WAAW,GAAG,KAAK,CAAC;oBACxB,IAAI,iBAAiB,IAAI,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE;wBACnE,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,aAAa,EAAE,uBAAuB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;qBAC7H;oBACD,IAAI,WAAW,KAAK,IAAI,IAAI,iBAAiB,KAAK,SAAS,EAAE;wBAC3D,MAAM,GAAG,iBAAiB,CAAC;qBAC5B;yBAAM;wBACL,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;4BAC1B,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,YAAY,EAAE,sBAAsB,EAAE,WAAW,CAAC,CAAE,CAAC,CAAC,wBAAwB;yBACrH;6BAAM;4BACL,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,sBAAsB,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAE,CAAC;yBAClG;qBACF;oBAED,OAAO,CAAC,MAAM,CAAC,CAAC;iBACjB;gBAAC,OAAO,GAAG,EAAE;oBACZ,0EAA0E;oBAC1E,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;YACH,CAAC,CAAA,CAAC,CAAC;QACL,CAAC;KAAA;IAGS,eAAe;QACvB,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QACjC,OAAO;YACL,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ;YACnC,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ;SACrC,CAAC;IACJ,CAAC;CAEF,CAAA;AAnWY,uBAAuB;IADnC,IAAA,sBAAU,GAAE;IAKR,mBAAA,IAAA,kBAAM,EAAC,0BAAc,CAAC,CAAA;IACtB,mBAAA,IAAA,kBAAM,EAAC,sCAAkB,CAAC,CAAA;IAC1B,mBAAA,IAAA,kBAAM,EAAC,oBAAc,CAAC,kBAAkB,CAAC,CAAA;IACzC,mBAAA,IAAA,kBAAM,EAAC,oBAAc,CAAC,aAAa,CAAC,CAAA;IACpC,mBAAA,IAAA,kBAAM,EAAC,0BAAU,CAAC,aAAa,CAAC,CAAA;6CAJe,0BAAc;QACd,sCAAkB;GALzD,uBAAuB,CAmWnC;AAnWY,0DAAuB"}
|
|
1
|
+
{"version":3,"file":"aws-resource-configurator.js","sourceRoot":"","sources":["../../../src/uilogic/cloud-resource-configurators/aws-resource-configurator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { CloudProviderEnum } from "@codiac.io/codiac-domain";
|
|
|
3
3
|
import { UserNameTenantCode } from "@codiac.io/codiac-ops-common";
|
|
4
4
|
import { RelayClient as GenRelayClient } from "../../apis/codiac-relay";
|
|
5
5
|
import { ILoginConfigurator } from "../i-login-configurator";
|
|
6
|
+
import { CloudProviderUser } from '../../apis/codiac-relay/contracts';
|
|
6
7
|
import { OperationMeta } from '../../ops';
|
|
7
8
|
import { IOutputStyler, IUserInputProvider } from '../../ops';
|
|
8
9
|
import { IMessagingClient } from '../i-messaging-client';
|
|
@@ -23,7 +24,7 @@ export declare class AzureInteractiveLoginConfigurator implements ILoginConfigur
|
|
|
23
24
|
* It does NOT attempt or defer to a silent authentication.
|
|
24
25
|
*
|
|
25
26
|
* iow: Invoke this when the silent methods have failed. */
|
|
26
|
-
promptToLogin(azSubscriptionId?: string | undefined, suppressConfirmations?: boolean | undefined, userName?: string | undefined, password?: string | undefined, webSocketId?: string): Promise<[boolean,
|
|
27
|
+
promptToLogin(azSubscriptionId?: string | undefined, suppressConfirmations?: boolean | undefined, userName?: string | undefined, password?: string | undefined, webSocketId?: string): Promise<[boolean, CloudProviderUser]>;
|
|
27
28
|
/** Opens the the external login url in a browser window.
|
|
28
29
|
* Returns at the end of the sequence.
|
|
29
30
|
* Throws on any errors.
|
|
@@ -55,8 +55,15 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
|
|
|
55
55
|
if (loginUrl == undefined)
|
|
56
56
|
throw new Error(`No interactive login url found.`);
|
|
57
57
|
// 3. Trigger the external auth sequence in a browser window.
|
|
58
|
-
let
|
|
59
|
-
|
|
58
|
+
let [success, username] = yield this.invokeBrowserSequence(loginUrl);
|
|
59
|
+
let cspUser = {
|
|
60
|
+
tenantCode: this.codiacUser.tenantCode,
|
|
61
|
+
provider: this.cloudProvider,
|
|
62
|
+
// subscriptionId: undefined, // <-- Azure deals with this explicitly later
|
|
63
|
+
username: username,
|
|
64
|
+
created: new Date(Date.now())
|
|
65
|
+
};
|
|
66
|
+
return [success, cspUser];
|
|
60
67
|
}
|
|
61
68
|
catch (err) {
|
|
62
69
|
if (_.isEmpty(err.message)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"az-interactive-login-configurator.js","sourceRoot":"","sources":["../../../src/uilogic/cloud-resource-configurators/az-interactive-login-configurator.ts"],"names":[],"mappings":";;;;AAAA,6BAA6B;AAC7B,4BAA6B;AAC7B,yCAA+C;AAC/C,4DAAqE;AACrE,4DAA6D;AAC7D,oEAAkE;AAClE,0DAAwE;AAGxE,mCAA0C;AAC1C,mCAA8E;AAI9E;;GAEG;AAEI,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAC5C,YACiC,MAAqB,EACpB,cAA8B,EACb,SAA2B,EACxC,UAA8B,EACf,GAAuB,EAC5B,OAAsB,EAC1B,MAAqB;QANhC,WAAM,GAAN,MAAM,CAAe;QACpB,mBAAc,GAAd,cAAc,CAAgB;QACb,cAAS,GAAT,SAAS,CAAkB;QACxC,eAAU,GAAV,UAAU,CAAoB;QACf,QAAG,GAAH,GAAG,CAAoB;QAC5B,YAAO,GAAP,OAAO,CAAe;QAC1B,WAAM,GAAN,MAAM,CAAe;IAEjE,CAAC;IAGD,IAAW,aAAa;QACtB,OAAO,iCAAiB,CAAC,KAAK,CAAC;IACjC,CAAC;IAED;;;gEAG4D;IAC/C,aAAa,CACxB,gBAAqC,EACrC,qBAA2C,EAC3C,QAA6B,EAC7B,QAA6B,EAC7B,WAAoB;;;YAEpB,IAAI;gBAEF,mDAAmD;gBAEnD,IAAI,WAA2B,CAAC;gBAChC,qBAAqB;gBACrB,6CAA6C;gBAC7C,WAAW;gBACX,oBAAoB;gBACpB,2CAA2C;gBAC3C,OAAO;gBACP,IAAI;gBACJ,WAAW,GAAG;oBACZ,QAAQ,EAAE,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAE,WAAW;iBACtD,CAAC;gBAEF,uBAAuB;gBACvB,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC;gBACpL,IAAI,UAAU,CAAC,KAAK;oBAAE,MAAM,UAAU,CAAC,KAAK,CAAC;gBAE7C,IAAI,QAAQ,GAAG,MAAA,UAAU,CAAC,MAAM,0CAAE,QAAQ,CAAC;gBAC3C,IAAI,QAAQ,IAAI,SAAS;oBAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;gBAE9E,6DAA6D;gBAC7D,IAAI,
|
|
1
|
+
{"version":3,"file":"az-interactive-login-configurator.js","sourceRoot":"","sources":["../../../src/uilogic/cloud-resource-configurators/az-interactive-login-configurator.ts"],"names":[],"mappings":"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"}
|
|
@@ -82,6 +82,14 @@ export declare class AzureResourceConfigurator implements ISecretStoreConfigurat
|
|
|
82
82
|
*/
|
|
83
83
|
private azIdentityNameValidator;
|
|
84
84
|
promptToLogin(providerSubscriptionId?: string, suppressConfirmations?: boolean, providedUserName?: string, providedSecret?: string): Promise<[boolean, string]>;
|
|
85
|
+
/** Suffixes the username with its applicable csp subscriptionId
|
|
86
|
+
*
|
|
87
|
+
* as:
|
|
88
|
+
* ```
|
|
89
|
+
* "<username> (<subscriptionId>)"
|
|
90
|
+
* ``` */
|
|
91
|
+
private userAndSubx;
|
|
92
|
+
private selectCachedUser;
|
|
85
93
|
captureImageRegistry(): Promise<ImageRegistry>;
|
|
86
94
|
private promptForSubscriptionId;
|
|
87
95
|
defineCluster(initial: Partial<ClusterDef>, defaults?: Partial<ClusterDef>): Promise<{
|