@codiac.io/codiac-cli 1.3.127 → 1.3.129
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-nats/gen/client.d.ts +72 -11
- package/dist/apis/codiac-api-nats/gen/client.js +967 -84
- package/dist/apis/codiac-api-nats/gen/client.js.map +1 -1
- package/dist/apis/codiac-api-nats/gen/config.d.ts +3 -15
- package/dist/apis/codiac-api-nats/gen/config.js +5 -4
- package/dist/apis/codiac-api-nats/gen/config.js.map +1 -1
- package/dist/apis/codiac-api-nats/gen/contracts/transformers.gen.d.ts +3 -2
- package/dist/apis/codiac-api-nats/gen/contracts/transformers.gen.js +23 -18
- package/dist/apis/codiac-api-nats/gen/contracts/transformers.gen.js.map +1 -1
- package/dist/apis/codiac-api-nats/gen/contracts/types.gen.d.ts +72 -20
- package/dist/apis/codiac-api-nats/gen/contracts/types.gen.js +18 -7
- package/dist/apis/codiac-api-nats/gen/contracts/types.gen.js.map +1 -1
- package/dist/apis/codiac-api-nats/gen/contracts.ng.d.ts +34 -7
- package/dist/apis/codiac-api-nats/gen/contracts.ng.js +1 -2
- package/dist/apis/codiac-api-nats/gen/contracts.ng.js.map +1 -1
- package/dist/apis/codiac-relay-nats/gen/client.d.ts +10 -13
- package/dist/apis/codiac-relay-nats/gen/client.js +35 -73
- package/dist/apis/codiac-relay-nats/gen/client.js.map +1 -1
- package/dist/apis/codiac-relay-nats/gen/config.d.ts +3 -16
- package/dist/apis/codiac-relay-nats/gen/config.js +7 -5
- package/dist/apis/codiac-relay-nats/gen/config.js.map +1 -1
- package/dist/apis/codiac-relay-nats/gen/contracts/types.gen.d.ts +3 -3
- package/dist/apis/codiac-relay-nats/gen/contracts.ng.d.ts +0 -7
- package/dist/apis/codiac-relay-nats/gen/contracts.ng.js +2 -2
- package/dist/apis/codiac-relay-nats/gen/contracts.ng.js.map +1 -1
- package/dist/apis/nats/nats-client.d.ts +0 -47
- package/dist/apis/nats/nats-client.js +279 -335
- package/dist/apis/nats/nats-client.js.map +1 -1
- package/dist/bootstrapper-for-api-clients.d.ts +1 -0
- package/dist/bootstrapper-for-api-clients.js +15 -2
- package/dist/bootstrapper-for-api-clients.js.map +1 -1
- package/dist/bootstrapper-for-enterprise-commands.js +22 -5
- package/dist/bootstrapper-for-enterprise-commands.js.map +1 -1
- package/dist/command-base-enterprise.d.ts +1 -1
- package/dist/command-base-enterprise.js +24 -8
- package/dist/command-base-enterprise.js.map +1 -1
- package/dist/commands/cluster/start.js +3 -3
- package/dist/commands/cluster/start.js.map +1 -1
- package/dist/commands/cluster/stop.js +3 -3
- package/dist/commands/cluster/stop.js.map +1 -1
- package/dist/commands/noc/cluster/create.js +3 -3
- package/dist/commands/noc/cluster/create.js.map +1 -1
- package/dist/commands/noc/cluster/destroy.js +3 -3
- package/dist/commands/noc/cluster/destroy.js.map +1 -1
- package/dist/ops/terminal-command-runner/local-command-runner.d.ts +1 -1
- package/dist/relay/relay-container.js +1 -1
- package/dist/relay/wsclient/relay-websocket-client.d.ts +2 -2
- package/dist/relay/wsclient/relay-websocket-client.js +1 -1
- package/dist/relay/wsclient/relay-websocket-client.js.map +1 -1
- package/dist/relay/wsclient/socket-contracts.d.ts +1 -1
- package/dist/sdk-adapters/azure/az-interactive-login-configurator.d.ts +1 -1
- package/dist/sdk-adapters/azure/az-interactive-login-configurator.js +95 -56
- package/dist/sdk-adapters/azure/az-interactive-login-configurator.js.map +1 -1
- package/dist/sdk-adapters/azure/azure-resource-configurator.d.ts +1 -1
- package/dist/sdk-adapters/azure/azure-resource-configurator.js +7 -7
- package/dist/sdk-adapters/azure/azure-resource-configurator.js.map +1 -1
- package/dist/uilogic/i-messaging-client.d.ts +0 -56
- package/dist/uilogic/i-messaging-client.js +84 -9
- package/dist/uilogic/i-messaging-client.js.map +1 -1
- package/dist/uilogic/lrp-watcher-predef.d.ts +1 -1
- package/dist/uilogic/lrp-watcher-predef.js +1 -1
- package/dist/uilogic/lrp-watcher-predef.js.map +1 -1
- package/dist/uilogic/lrp-watcher.d.ts +1 -1
- package/dist/uilogic/lrp-watcher.js +2 -2
- package/dist/uilogic/lrp-watcher.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +7 -6
|
@@ -18,7 +18,7 @@ const INTERFACES_CLI_1 = require("../ops/INTERFACES_CLI");
|
|
|
18
18
|
const Docker = require("dockerode");
|
|
19
19
|
const entities_1 = require("../ops/entities");
|
|
20
20
|
const DEFAULT_IMAGE_NAME = "codiacimages/codiac-relay";
|
|
21
|
-
exports.DEFAULT_IMAGE_TAG = "1.6.
|
|
21
|
+
exports.DEFAULT_IMAGE_TAG = "1.6.52";
|
|
22
22
|
const DEFAULT_CONTAINER_NAME = "codiac-relay";
|
|
23
23
|
const DEFAULT_HEALTH_CHECK_URL = "http://localhost:5799/heartbeat-json"; // /ready-state";
|
|
24
24
|
const DEFAULT_RETRY_TIMOUT_IN_MINUTES = 1;
|
|
@@ -3,8 +3,8 @@ import { Result } from "@codiac.io/codiac-common/contracts";
|
|
|
3
3
|
import { interfaces } from "inversify";
|
|
4
4
|
import { WebsocketListenerSettings } from "./websocket-listener-settings";
|
|
5
5
|
import { ApiUserCreds } from "../../apis/codiac-api/common/api-user-creds";
|
|
6
|
-
import { IMessageSendMeta,
|
|
7
|
-
export declare class RelayWebsocketClient
|
|
6
|
+
import { IMessageSendMeta, MessageHandlerOf, MessagePayload } from "@codiac.io/codiac-messaging/dist/nats/client";
|
|
7
|
+
export declare class RelayWebsocketClient {
|
|
8
8
|
private credentials;
|
|
9
9
|
private logger;
|
|
10
10
|
static bootstrap(ioc: interfaces.Container, settings?: WebsocketListenerSettings | undefined): void;
|
|
@@ -18,7 +18,7 @@ class HandlerSubx {
|
|
|
18
18
|
this.handler = handler;
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
let RelayWebsocketClient = RelayWebsocketClient_1 = class RelayWebsocketClient {
|
|
21
|
+
let RelayWebsocketClient = RelayWebsocketClient_1 = class RelayWebsocketClient /* implements IMessagingClient */ {
|
|
22
22
|
static bootstrap(ioc, settings) {
|
|
23
23
|
ioc.bind(websocket_listener_settings_1.WebsocketListenerSettings).toConstantValue(settings !== null && settings !== void 0 ? settings : {});
|
|
24
24
|
ioc.bind(RelayWebsocketClient_1).toSelf().inSingletonScope(); // <-- There can be only one socket connection from the CLI.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay-websocket-client.js","sourceRoot":"","sources":["../../../src/relay/wsclient/relay-websocket-client.ts"],"names":[],"mappings":";;;;;AAAA,4DAAqE;AAErE,yCAA2D;AAC3D,4BAA6B;AAC7B,gCAAgC;AAChC,qDAAuC;AACvC,iDAAgD;AAChD,+EAA0E;AAE1E,gFAA2E;AAG3E,oFAAoF;AACpF,MAAM,WAAW;IACf,YAAmB,EAAU,EAAS,OAAuB;QAA1C,OAAE,GAAF,EAAE,CAAQ;QAAS,YAAO,GAAP,OAAO,CAAgB;IAC7D,CAAC;CACF;AAGM,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;
|
|
1
|
+
{"version":3,"file":"relay-websocket-client.js","sourceRoot":"","sources":["../../../src/relay/wsclient/relay-websocket-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import * as sdk from "../../sdk";
|
|
|
6
6
|
import { CspPrimaryCredsMeta, LogintoCloudProviderRequest } from '../../apis/codiac-relay/contracts';
|
|
7
7
|
import { OperationMeta } from '../../ops/entities';
|
|
8
8
|
import { IOutputStyler, IUserInputProvider } from '../../ops';
|
|
9
|
-
import { IMessagingClient } from
|
|
9
|
+
import { IMessagingClient } from "@codiac.io/codiac-messaging/dist/nats/client";
|
|
10
10
|
import { ICspAccountFilter, ICspLoginOptions } from '../../sdk';
|
|
11
11
|
/** Implements AuthorizationCode Flow with a popup-browser interactive login
|
|
12
12
|
* for user to authenticate and provide consent.
|
|
@@ -11,6 +11,13 @@ const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
|
|
|
11
11
|
const codiac_relay_1 = require("../../apis/codiac-relay");
|
|
12
12
|
const entities_1 = require("../../ops/entities");
|
|
13
13
|
const ops_1 = require("../../ops");
|
|
14
|
+
function unblockAndSleep(durationInSecs) {
|
|
15
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
|
+
return new Promise(resolve => {
|
|
17
|
+
setTimeout(() => resolve(), durationInSecs * 1000);
|
|
18
|
+
});
|
|
19
|
+
});
|
|
20
|
+
}
|
|
14
21
|
/** Implements AuthorizationCode Flow with a popup-browser interactive login
|
|
15
22
|
* for user to authenticate and provide consent.
|
|
16
23
|
*/
|
|
@@ -44,8 +51,11 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
|
|
|
44
51
|
// socketId: await this.openWebSocket()
|
|
45
52
|
// };
|
|
46
53
|
// }
|
|
54
|
+
// commChannel = {
|
|
55
|
+
// socketId: await this.msgClient.connect() // .start()
|
|
56
|
+
// };
|
|
47
57
|
commChannel = {
|
|
48
|
-
socketId:
|
|
58
|
+
socketId: "not-used"
|
|
49
59
|
};
|
|
50
60
|
// 2. Get the login url
|
|
51
61
|
const req = {
|
|
@@ -79,11 +89,10 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
|
|
|
79
89
|
this.logger.error(`Error logging into ${this.cloudProvider}`, err);
|
|
80
90
|
}
|
|
81
91
|
throw new Error(`Error logging into ${this.cloudProvider}: ${(_b = err.name) !== null && _b !== void 0 ? _b : ""} ${(_c = err.message) !== null && _c !== void 0 ? _c : "(not details available)"}`);
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
}
|
|
92
|
+
// } finally {
|
|
93
|
+
// if (this.msgClient.isConnected()) {
|
|
94
|
+
// await this.msgClient.disconnect();
|
|
95
|
+
// }
|
|
87
96
|
}
|
|
88
97
|
});
|
|
89
98
|
}
|
|
@@ -102,36 +111,53 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
|
|
|
102
111
|
let isAuthed = false; // Read this from the websocket message / fail / timeout.
|
|
103
112
|
let cspUserName; // Read this from the websocket message
|
|
104
113
|
let handlerId = this.msgClient.subscribe("loginComplete", (err, msg, meta, raw) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
114
|
+
return new Promise((resolve) => {
|
|
115
|
+
var _a, _b;
|
|
116
|
+
isCompleted = true;
|
|
117
|
+
// TODO: get these from the completion message
|
|
118
|
+
isAuthed = Boolean((_a = msg === null || msg === void 0 ? void 0 : msg.success) !== null && _a !== void 0 ? _a : "false") === true;
|
|
119
|
+
cspUserName = (_b = msg === null || msg === void 0 ? void 0 : msg.cspUserName) !== null && _b !== void 0 ? _b : "anonymous@domain.com";
|
|
120
|
+
// const responded = (<nats.Msg>raw).respond(msg as nats.Payload, {});
|
|
121
|
+
this.logger.debug(`Interactive ${this.cloudProvider} login sequence completed [${cspUserName}]`, msg);
|
|
122
|
+
this.msgClient.unsubscribe("loginComplete", { subscriptionId: handlerId });
|
|
123
|
+
// resolve([isAuthed, cspUserName]);
|
|
124
|
+
resolve();
|
|
125
|
+
// return;
|
|
126
|
+
});
|
|
127
|
+
}), { max: 1 }); // TODO: Consider using the timeout below here instead/both? { timeout: 5*60*1000 }
|
|
115
128
|
// 3. Sprout the login interaction in a browser popup
|
|
116
129
|
let childProcess = yield open(loginUrl, {});
|
|
117
130
|
// 4. Wait for the completion message via websocket
|
|
118
131
|
let timeout = Date.now() + 300000; // 5 mins
|
|
119
132
|
this._ui.startSpinner(`Waiting on interactive login...`);
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
133
|
+
while (!isCompleted && Boolean(Date.now() <= timeout)) {
|
|
134
|
+
yield unblockAndSleep(0.25);
|
|
135
|
+
}
|
|
136
|
+
if (isCompleted) {
|
|
137
|
+
// Kill the popup browser process (ie: close the window) cuz we know the sequence has completed.
|
|
138
|
+
// childProcess.kill(); // Commneted out bc it doesnt actually close the browser window.
|
|
139
|
+
this._ui.stopSpinner("Completed");
|
|
140
|
+
resolve([isAuthed, cspUserName !== null && cspUserName !== void 0 ? cspUserName : ""]);
|
|
141
|
+
}
|
|
142
|
+
else if (Date.now() > timeout) {
|
|
143
|
+
// console.log(".");
|
|
144
|
+
this._ui.stopSpinner("Timed out");
|
|
145
|
+
resolve([false, "none"]); // <--- This is our safety net
|
|
146
|
+
}
|
|
147
|
+
// let intervalId = setInterval(() => {
|
|
148
|
+
// if (isCompleted) {
|
|
149
|
+
// // Kill the popup browser process (ie: close the window) cuz we know the sequence has completed.
|
|
150
|
+
// // childProcess.kill(); // Commneted out bc it doesnt actually close the browser window.
|
|
151
|
+
// this._ui.stopSpinner("Completed");
|
|
152
|
+
// clearInterval(intervalId);
|
|
153
|
+
// resolve([isAuthed, cspUserName ?? ""])
|
|
154
|
+
// } else if (Date.now() > timeout) {
|
|
155
|
+
// // console.log(".");
|
|
156
|
+
// this._ui.stopSpinner("Timed out");
|
|
157
|
+
// clearInterval(intervalId);
|
|
158
|
+
// resolve([false, "none"]); // <--- This is our safety net
|
|
159
|
+
// }
|
|
160
|
+
// }, 250);
|
|
135
161
|
}
|
|
136
162
|
catch (err) {
|
|
137
163
|
reject(err);
|
|
@@ -162,7 +188,8 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
|
|
|
162
188
|
// 1. Establish 2-way messaging channel w the relay
|
|
163
189
|
let commChannel;
|
|
164
190
|
commChannel = {
|
|
165
|
-
socketId:
|
|
191
|
+
// socketId: await this.msgClient.connect() // .start()
|
|
192
|
+
socketId: "not-used"
|
|
166
193
|
};
|
|
167
194
|
// 2. Get the logout url
|
|
168
195
|
let authResult = yield this.genRelayClient.Call.csp_logout_interactive({ providerCode: this.cloudProvider, accountRef: accountFilter, commChannel: commChannel, correlationId: this.opMeta.correlationId }, {});
|
|
@@ -180,11 +207,10 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
|
|
|
180
207
|
this.logger.error(`Error logging out from ${this.cloudProvider}`, err);
|
|
181
208
|
}
|
|
182
209
|
throw new Error(`Error logging out from ${this.cloudProvider}: ${(_c = err.name) !== null && _c !== void 0 ? _c : ""} ${(_d = err.message) !== null && _d !== void 0 ? _d : "(no details available)"}`);
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
}
|
|
210
|
+
// } finally {
|
|
211
|
+
// if (this.msgClient.isConnected()) {
|
|
212
|
+
// await this.msgClient.disconnect();
|
|
213
|
+
// }
|
|
188
214
|
}
|
|
189
215
|
});
|
|
190
216
|
}
|
|
@@ -197,6 +223,7 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
|
|
|
197
223
|
invokeLogoutBrowserSequence(logoutUrl, currentCspUserName) {
|
|
198
224
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
199
225
|
return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
226
|
+
var _a;
|
|
200
227
|
try {
|
|
201
228
|
let isCompleted = false;
|
|
202
229
|
let isAuthed = false; // Read this from the websocket message / fail / timeout.
|
|
@@ -218,7 +245,7 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
|
|
|
218
245
|
let subxId;
|
|
219
246
|
if (waitForResult) {
|
|
220
247
|
subxId = this.msgClient.subscribe("logoutComplete", (err, msg, meta, raw) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
221
|
-
var
|
|
248
|
+
var _b;
|
|
222
249
|
try {
|
|
223
250
|
isCompleted = true;
|
|
224
251
|
// TODO: get these from the completion message
|
|
@@ -228,12 +255,12 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
|
|
|
228
255
|
this.msgClient.unsubscribe("logoutComplete", { subscriptionId: subxId });
|
|
229
256
|
}
|
|
230
257
|
catch (err) {
|
|
231
|
-
this.logger.error(`Error handling logoutComplete on [subxId: ${subxId}]: ${(
|
|
258
|
+
this.logger.error(`Error handling logoutComplete on [subxId: ${subxId}]: ${(_b = err.message) !== null && _b !== void 0 ? _b : "no details available"}`, err.stack);
|
|
232
259
|
}
|
|
233
260
|
finally {
|
|
234
261
|
return;
|
|
235
262
|
}
|
|
236
|
-
}));
|
|
263
|
+
}), { max: 1 }); // TODO: Consider using the timeout below here instead/both? { timeout: 5*60*1000 }
|
|
237
264
|
}
|
|
238
265
|
// 3. Sprout the login interaction in a browser popup
|
|
239
266
|
let childProcess = yield open(logoutUrl, {});
|
|
@@ -241,22 +268,34 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
|
|
|
241
268
|
// 4. Wait for the completion message via websocket
|
|
242
269
|
let timeout = Date.now() + 300000; // 5 mins
|
|
243
270
|
this._ui.startSpinner(`Waiting on interactive logout...`);
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
271
|
+
while (!isCompleted && Boolean(Date.now() <= timeout)) {
|
|
272
|
+
yield unblockAndSleep(0.25);
|
|
273
|
+
}
|
|
274
|
+
if (isCompleted) {
|
|
275
|
+
// Kill the popup browser process (ie: close the window) cuz we know the sequence has completed.
|
|
276
|
+
// childProcess.kill(); // Commneted out bc it doesnt actually close the browser window.
|
|
277
|
+
this._ui.stopSpinner("Completed");
|
|
278
|
+
resolve([isAuthed, (_a = cspUserName !== null && cspUserName !== void 0 ? cspUserName : currentCspUserName) !== null && _a !== void 0 ? _a : ""]);
|
|
279
|
+
}
|
|
280
|
+
else if (Date.now() > timeout) {
|
|
281
|
+
// console.log(".");
|
|
282
|
+
this._ui.stopSpinner("Timed out");
|
|
283
|
+
resolve([false, "none"]); // <--- This is our safety net
|
|
284
|
+
}
|
|
285
|
+
// let intervalId = setInterval(() => {
|
|
286
|
+
// if (isCompleted) {
|
|
287
|
+
// // Kill the popup browser process (ie: close the window) cuz we know the sequence has completed.
|
|
288
|
+
// // childProcess.kill(); // Commneted out bc it doesnt actually close the browser window.
|
|
289
|
+
// this._ui.stopSpinner("Completed");
|
|
290
|
+
// clearInterval(intervalId);
|
|
291
|
+
// resolve([isAuthed, cspUserName ?? currentCspUserName ?? ""])
|
|
292
|
+
// } else if (Date.now() > timeout) {
|
|
293
|
+
// // console.log(".");
|
|
294
|
+
// this._ui.stopSpinner("Timed out");
|
|
295
|
+
// clearInterval(intervalId);
|
|
296
|
+
// resolve([false, "none"]); // <--- This is our safety net
|
|
297
|
+
// }
|
|
298
|
+
// }, 250);
|
|
260
299
|
}
|
|
261
300
|
else {
|
|
262
301
|
resolve([true, ""]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"az-interactive-login-configurator.js","sourceRoot":"","sources":["../../../src/sdk-adapters/azure/az-interactive-login-configurator.ts"],"names":[],"mappings":";;;;AAAA,6BAA6B;AAC7B,4BAA6B;AAC7B,yCAA+C;AAC/C,4DAAqE;AACrE,4DAA6D;AAC7D,oEAAkE;
|
|
1
|
+
{"version":3,"file":"az-interactive-login-configurator.js","sourceRoot":"","sources":["../../../src/sdk-adapters/azure/az-interactive-login-configurator.ts"],"names":[],"mappings":"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"}
|
|
@@ -104,7 +104,7 @@ export declare class AzureResourceConfigurator implements sdk.IFileStoreConfigur
|
|
|
104
104
|
spec: ClusterDef;
|
|
105
105
|
defaults: Partial<ClusterDef>;
|
|
106
106
|
}>;
|
|
107
|
-
promptForNodeGroup(
|
|
107
|
+
promptForNodeGroup(cluster: AtLeast<ClusterDef, "name" | "providerSubscription" | "locationName">, nodeGroupSpec: Partial<Pick<ClusterDef, "nodeSpec" | "nodesMin" | "nodesMax" | "startingNodeCount">>, nodePoolName: string, defaultMaxNodes?: number): Promise<api.NodePoolDef>;
|
|
108
108
|
promptForIngressSpec(current?: Partial<IngressDef>): Promise<IngressDef | undefined>;
|
|
109
109
|
defineClusterCaptureParams(initial: Partial<ClusterDef>, rootMap: RootMap, defaults?: Partial<ClusterDef>, cspTenantId?: string, cspUser?: CspPrimaryCredsMeta): Promise<{
|
|
110
110
|
spec: ClusterCaptureDef;
|
|
@@ -354,7 +354,7 @@ let AzureResourceConfigurator = class AzureResourceConfigurator {
|
|
|
354
354
|
// initialPodSubnet = (typeof (initial.podSubnet) == 'string') ? initial.podSubnet : initial.podSubnet[0]; // Azure supports only one pod subnet here: ignore any additionals.
|
|
355
355
|
// }
|
|
356
356
|
workingModel.subnet = yield this.promptForVnetSubnet(workingModel.providerSubscription, workingModel.locationName, initialSubnet /* , initialPodSubnet */);
|
|
357
|
-
const mainNodeGroup = yield this.promptForNodeGroup(initial, ORIGINAL_NODE_POOL_NAME, DEFAULT_STARTING_NODE_COUNT);
|
|
357
|
+
const mainNodeGroup = yield this.promptForNodeGroup(workingModel, initial, ORIGINAL_NODE_POOL_NAME, DEFAULT_STARTING_NODE_COUNT);
|
|
358
358
|
// TODO: Refactor to --> cluster.nodePools = [mainNodeGroup];
|
|
359
359
|
workingModel.nodeSpec = mainNodeGroup.nodeSpec;
|
|
360
360
|
workingModel.startingNodeCount = mainNodeGroup.startingNodeCount;
|
|
@@ -400,17 +400,17 @@ let AzureResourceConfigurator = class AzureResourceConfigurator {
|
|
|
400
400
|
}));
|
|
401
401
|
});
|
|
402
402
|
}
|
|
403
|
-
promptForNodeGroup(
|
|
403
|
+
promptForNodeGroup(cluster, nodeGroupSpec, nodePoolName, defaultMaxNodes = 3) {
|
|
404
404
|
var _a, _b, _c, _d;
|
|
405
405
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
406
406
|
try {
|
|
407
407
|
// const isWindows = await this._ui.promptConfirm("winNodePool", "Is Windows?: ", false);
|
|
408
|
-
const nodeSpec = yield this.promptForNodeSpec(
|
|
409
|
-
const nodesMin = (yield this._ui.prompt("startingNodeCount", "Min nodes: ", true, (_a =
|
|
410
|
-
const nodesMax = (yield this._ui.prompt("startingNodeCount", "Max nodes: ", true, (_b =
|
|
408
|
+
const nodeSpec = yield this.promptForNodeSpec(cluster.providerSubscription, cluster.locationName, nodeGroupSpec.nodeSpec);
|
|
409
|
+
const nodesMin = (yield this._ui.prompt("startingNodeCount", "Min nodes: ", true, (_a = nodeGroupSpec.nodesMin) !== null && _a !== void 0 ? _a : 1));
|
|
410
|
+
const nodesMax = (yield this._ui.prompt("startingNodeCount", "Max nodes: ", true, (_b = nodeGroupSpec.nodesMax) !== null && _b !== void 0 ? _b : defaultMaxNodes));
|
|
411
411
|
const defaultStarting = Math.ceil(nodesMax + nodesMin / 2); // nearest avg integer
|
|
412
|
-
const startingNodeCount = (yield this._ui.prompt("startingNodeCount", "Starting node count: ", true, (_c =
|
|
413
|
-
let ndef = Object.assign({ name: nodePoolName, clusterName:
|
|
412
|
+
const startingNodeCount = (yield this._ui.prompt("startingNodeCount", "Starting node count: ", true, (_c = nodeGroupSpec.startingNodeCount) !== null && _c !== void 0 ? _c : defaultStarting));
|
|
413
|
+
let ndef = Object.assign({ name: nodePoolName, clusterName: cluster.name, nodeSpec: nodeSpec, nodesMin: nodesMin, nodesMax: nodesMax, startingNodeCount: startingNodeCount }, this.createAuditable());
|
|
414
414
|
// if (isWindows == true) ndef.isWindows = isWindows;
|
|
415
415
|
return ndef;
|
|
416
416
|
}
|