@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
|
@@ -1,115 +1,161 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
require("reflect-metadata");
|
|
5
4
|
const core_1 = require("@oclif/core");
|
|
6
5
|
const cli_common_1 = require("../../cli-common");
|
|
7
|
-
const
|
|
6
|
+
const command_base_exec_1 = require("../../command-base-exec");
|
|
8
7
|
const cloud_provider_contextualizer_1 = require("../../uilogic/cloud-provider-contextualizer");
|
|
8
|
+
const config_ui_utils_1 = require("../../uilogic/config-ui-utils");
|
|
9
9
|
const prettify_1 = require("../../prettify");
|
|
10
|
-
class CabinetCreate extends
|
|
11
|
-
|
|
10
|
+
class CabinetCreate extends command_base_exec_1.CommandBaseExec {
|
|
11
|
+
bootstrap() {
|
|
12
|
+
super.bootstrap();
|
|
13
|
+
cloud_provider_contextualizer_1.CloudProviderContextualizer.bootstrap(this.ioc);
|
|
14
|
+
}
|
|
15
|
+
captureArgs(enterpriseCode) {
|
|
16
|
+
var _a, _b, _c;
|
|
17
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
18
|
+
const { args, flags } = yield this.parse(CabinetCreate);
|
|
19
|
+
//Defaults enterprise
|
|
20
|
+
let partial = { enterprise: enterpriseCode };
|
|
21
|
+
if (args.cabinet)
|
|
22
|
+
partial.cabinet = args.cabinet;
|
|
23
|
+
if (flags.environment)
|
|
24
|
+
partial.environment = flags.environment;
|
|
25
|
+
if (flags.cluster)
|
|
26
|
+
partial.cluster = flags.cluster;
|
|
27
|
+
//Overrides enterpriseCode if passed in
|
|
28
|
+
if (flags.enterprise)
|
|
29
|
+
partial.enterprise = flags.enterprise;
|
|
30
|
+
const interactionMode = (_b = (_a = (flags.echo ? config_ui_utils_1.InteractionModes.echo : undefined)) !== null && _a !== void 0 ? _a : (flags["to-script"] ? config_ui_utils_1.InteractionModes.toscript : undefined)) !== null && _b !== void 0 ? _b : (flags.silent ? config_ui_utils_1.InteractionModes.silent : undefined);
|
|
31
|
+
const takeDefaults = (_c = flags['take-defaults']) !== null && _c !== void 0 ? _c : false;
|
|
32
|
+
return [partial, interactionMode, takeDefaults];
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
validatePartial(partial, rootMap) {
|
|
36
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
37
|
+
if (!partial.cabinet)
|
|
38
|
+
throw new Error("Cabinet name must be set");
|
|
39
|
+
if (!partial.environment)
|
|
40
|
+
throw new Error("Environment must be set");
|
|
41
|
+
if (!partial.enterprise) {
|
|
42
|
+
if (rootMap.enterprises.length > 1)
|
|
43
|
+
throw new Error("Enterprise must be set");
|
|
44
|
+
else
|
|
45
|
+
partial.enterprise = rootMap.enterprises[0].name;
|
|
46
|
+
}
|
|
47
|
+
if (!partial.cluster)
|
|
48
|
+
throw new Error("Cluster must be set");
|
|
49
|
+
// Validate cabinet name
|
|
50
|
+
const cabinetNameRegex = /^[a-z0-9]([-a-z0-9]*[a-z0-9])?$/;
|
|
51
|
+
if (!cabinetNameRegex.test(partial.cabinet)) {
|
|
52
|
+
throw new Error("Invalid cabinet name. It must consist of lowercase alphanumeric characters or '-', and must start and end with an alphanumeric character. Maximum length is 63 characters.");
|
|
53
|
+
}
|
|
54
|
+
// Matches EKS
|
|
55
|
+
if (partial.cabinet.length > 63) {
|
|
56
|
+
throw new Error("Cabinet name is too long. Maximum length is 63 characters.");
|
|
57
|
+
}
|
|
58
|
+
//validate enterprise exists
|
|
59
|
+
let enterprise = rootMap.enterprises.find(e => e.name === partial.enterprise);
|
|
60
|
+
if (!enterprise)
|
|
61
|
+
throw new Error(`Enterprise ${partial.enterprise} not found`);
|
|
62
|
+
//Validate Environment exists
|
|
63
|
+
let environment = enterprise === null || enterprise === void 0 ? void 0 : enterprise.environments.find(env => env.name === partial.environment);
|
|
64
|
+
if (!environment)
|
|
65
|
+
throw new Error(`Environment ${partial.environment} not found in enterprise ${partial.enterprise}`);
|
|
66
|
+
//Validate cluster exists & maybe default to first if not set?
|
|
67
|
+
let clusters = (environment === null || environment === void 0 ? void 0 : environment.clusters) || [];
|
|
68
|
+
let cluster = clusters.find(c => c.name === partial.cluster);
|
|
69
|
+
if (!cluster)
|
|
70
|
+
throw new Error(`Cluster ${partial.cluster} not found in environment ${partial.environment}`);
|
|
71
|
+
//Validate cabinet name and not duplicate
|
|
72
|
+
let cabinet = environment.cabinets.find(cab => cab.name === partial.cabinet);
|
|
73
|
+
if (cabinet)
|
|
74
|
+
throw new Error(`Cabinet ${partial.cabinet} already exists in environment ${partial.environment}`);
|
|
75
|
+
return partial;
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
buildCandidate_silently(partial, rootMap) {
|
|
12
79
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
this.logger.error(`Error creating cabinet: ${result.message || ""}; ${result.error.message}`, result.error);
|
|
70
|
-
this._ui.userMessage(`Error creating cabinet: ${result.message || ""}; ${result.error.message}`);
|
|
71
|
-
}
|
|
72
|
-
else if (!result.success) {
|
|
73
|
-
this.logger.notice(`Cabinet creation failed without error. ${result.message}`);
|
|
74
|
-
this._ui.userMessage(`Cabinet creation failed without error. ${result.message}`);
|
|
75
|
-
}
|
|
76
|
-
else if (result.output) {
|
|
77
|
-
let cab = result.output;
|
|
78
|
-
this.logger.notice(`${this._styler.colorGood("Success!")} Cabinet [${this._styler.hilite(cab.name)}] created for enterprise [${cab.enterpriseCode}]`);
|
|
79
|
-
this._ui.userMessage(`${this._styler.colorGood("Success!")} Cabinet [${this._styler.hilite(cab.name)}] created for enterprise [${cab.enterpriseCode}]`);
|
|
80
|
-
} // else { this._ui.userMessage("Supposedly succeeded, but we didnt get the response back that we expected. You might want to verify the cabinet."); }
|
|
81
|
-
}
|
|
82
|
-
catch (err) {
|
|
83
|
-
this._ui.userMessage(`Error ${(_b = err.name) !== null && _b !== void 0 ? _b : ""} ${(_c = err.message) !== null && _c !== void 0 ? _c : ""}`);
|
|
84
|
-
}
|
|
85
|
-
finally {
|
|
86
|
-
return;
|
|
87
|
-
}
|
|
88
|
-
}));
|
|
89
|
-
}
|
|
90
|
-
catch (err) {
|
|
91
|
-
this.handleError(err);
|
|
92
|
-
reject(err);
|
|
93
|
-
}
|
|
94
|
-
}));
|
|
95
|
-
}));
|
|
80
|
+
partial = yield this.validatePartial(partial, rootMap);
|
|
81
|
+
return partial;
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
buildCandidate_interactively(partial, rootMap, takeDefaults) {
|
|
85
|
+
var _a;
|
|
86
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
87
|
+
let environment;
|
|
88
|
+
let cluster;
|
|
89
|
+
let cabinetName;
|
|
90
|
+
let candidate;
|
|
91
|
+
let confirm;
|
|
92
|
+
// Wrap in a do-while loop to allow for re-entry if the user wants to re-enter any values after confirmation
|
|
93
|
+
do {
|
|
94
|
+
cabinetName = (_a = partial.cabinet) !== null && _a !== void 0 ? _a : (yield this._ui.prompt("cabinetName", "Cabinet name: ", true));
|
|
95
|
+
[environment, cluster] = yield this.rootMapUtils.promptForEnviroCluster(rootMap, partial.enterprise, partial.environment, undefined, undefined);
|
|
96
|
+
let uiCloudProvider = this.ioc.get(cloud_provider_contextualizer_1.CloudProviderContextualizer);
|
|
97
|
+
yield uiCloudProvider.promptForCloudProviderCreds(this.ioc, cluster.provider, undefined, undefined, undefined, cluster.providerSubscriptionId);
|
|
98
|
+
candidate = {
|
|
99
|
+
enterprise: partial.enterprise,
|
|
100
|
+
environment: environment.name,
|
|
101
|
+
cabinet: cabinetName,
|
|
102
|
+
cluster: cluster.name
|
|
103
|
+
};
|
|
104
|
+
// We want to validate before we show the user the full/final preview
|
|
105
|
+
candidate = yield this.validatePartial(candidate, rootMap);
|
|
106
|
+
// CONFIRM
|
|
107
|
+
let preview = Object.assign(Object.assign({}, candidate), { cluster: { name: cluster.name, provider: cluster.provider, location: cluster.locationName } });
|
|
108
|
+
this.dataAuthUtils.removeAcl(preview);
|
|
109
|
+
this._ui.userMessage((0, prettify_1.prettify)(preview));
|
|
110
|
+
this._ui.userMessage("You are about to create this cabinet");
|
|
111
|
+
confirm = yield this._ui.promptConfirm("confirm", `Continue? (ctrl-C to cancel)`, false);
|
|
112
|
+
} while (confirm !== true);
|
|
113
|
+
return candidate;
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
buildCommandString(candidate, cmd) {
|
|
117
|
+
cmd.push(candidate.cabinet);
|
|
118
|
+
cmd.push("--enterprise", candidate.enterprise);
|
|
119
|
+
cmd.push("--environment", candidate.environment);
|
|
120
|
+
cmd.push("--cluster", candidate.cluster);
|
|
121
|
+
cmd.push("--silent");
|
|
122
|
+
return cmd;
|
|
123
|
+
}
|
|
124
|
+
executeTask(candidate) {
|
|
125
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
126
|
+
this._ui.startSpinner(`Creating new cabinet [${candidate.enterprise}/${candidate.cabinet}]...`);
|
|
127
|
+
let result = yield this.genRelayClient.Call.postExecuteCabinetMaker({ targetCabinet: candidate, targetClusterName: candidate.cluster });
|
|
128
|
+
this._ui.stopSpinner(`${result.success ? "Success!" : "Failed."}`);
|
|
129
|
+
if (result.error) {
|
|
130
|
+
this.logger.error(`Error creating cabinet: ${result.message || ""}; ${result.error.message}`, result.error);
|
|
131
|
+
this._ui.userMessage(`Error creating cabinet: ${result.message || ""}; ${result.error.message}`);
|
|
132
|
+
}
|
|
133
|
+
else if (!result.success) {
|
|
134
|
+
this.logger.notice(`Cabinet creation failed without error. ${result.message}`);
|
|
135
|
+
this._ui.userMessage(`Cabinet creation failed without error. ${result.message}`);
|
|
96
136
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
this.logger.
|
|
100
|
-
|
|
101
|
-
// return new Promise<void>(async (res,rej) => rej(new Error(`Error parsing arguments: ${err}`)));
|
|
137
|
+
else if (result.output) {
|
|
138
|
+
let cab = result.output;
|
|
139
|
+
this.logger.notice(`${this._styler.colorGood("Success!")} Cabinet [${this._styler.hilite(cab.name)}] created for enterprise [${cab.enterpriseCode}]`);
|
|
140
|
+
this._ui.userMessage(`${this._styler.colorGood("Success!")} Cabinet [${this._styler.hilite(cab.name)}] created for enterprise [${cab.enterpriseCode}]`);
|
|
102
141
|
}
|
|
103
142
|
});
|
|
104
143
|
}
|
|
105
144
|
}
|
|
106
145
|
exports.default = CabinetCreate;
|
|
107
|
-
CabinetCreate.description = 'Initializes a cabinet for a given enterprise and environment.
|
|
146
|
+
CabinetCreate.description = 'Initializes a cabinet for a given enterprise and environment. Returns an error if the cabinet already exists.';
|
|
108
147
|
CabinetCreate.aliases = ["cab:create"];
|
|
109
148
|
CabinetCreate.args = {
|
|
110
149
|
cabinet: core_1.Args.string({ required: false, description: 'The name of the cabinet to create' })
|
|
111
150
|
};
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
151
|
+
//TODO: Finish me!!
|
|
152
|
+
CabinetCreate.examples = [
|
|
153
|
+
{ description: "Create a cabinet interativley.", command: "cod cabinet create" },
|
|
154
|
+
{ description: "Create a cabinet interativley and assemble a non-interactive command string.", command: "cod cabinet create --echo" },
|
|
155
|
+
{ description: "Assemble a non-interactive command string WITHOUT actually creating a cabinet (dry run).", command: "cod cabinet create --to-script" },
|
|
156
|
+
{ description: "Create a cabinet silently.", command: "cod cabinet create my-cab-name --enterprise main -e dev-environemt -c my-cluster --silent" },
|
|
157
|
+
];
|
|
158
|
+
CabinetCreate.flags = Object.assign(Object.assign({}, cli_common_1.commandBase.globalFlags), { help: core_1.Flags.help({ char: 'h' }), enterprise: core_1.Flags.string({ description: '(required only if more than one enterprise exists) The name of the enterprise under which to create this cabinet.' }), environment: core_1.Flags.string({ char: 'e', multiple: false, description: '(optional: defaults to that of the current project branch) The name of the environment this cabinet will be grouped under.' }), cluster: core_1.Flags.string({ char: 'c', description: '(optional: defaults to the first cluster in the environment) The name of the cluster to use for the cabinet.' }), silent: core_1.Flags.boolean({ exclusive: ["echo", "to-script"], description: 'Non-Interactive mode; executes without any user interaction and fails on any missing or invalid arguments.' }), echo: core_1.Flags.boolean({ exclusive: ["to-script", "silent"], description: 'Echo interaction mode; renders the equivalent non-interactive cli command for future use before final execution.' }), "to-script": core_1.Flags.boolean({ exclusive: ["echo", "silent"], description: 'Toscript interaction mode; renders the equivalent non-interactive cli command WITHOUT any execution.' }),
|
|
159
|
+
//Not sure what to do with this one yet
|
|
160
|
+
"take-defaults": core_1.Flags.boolean({ exclusive: ["silent"], description: "Setting this to true prevents prompting for confirmation on parameters that were passed in or were automatically set to default values (Irrelevant in --silent mode)." }) });
|
|
115
161
|
//# sourceMappingURL=create.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/cabinet/create.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/cabinet/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,8 +77,13 @@ class CspLogin extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
77
77
|
else {
|
|
78
78
|
// interactive auth flow
|
|
79
79
|
try {
|
|
80
|
-
let
|
|
81
|
-
|
|
80
|
+
let cspUser = yield this.uiCloudProvider.promptForCloudProviderCreds(this.ioc, provider, Boolean(flags.silent));
|
|
81
|
+
let subx = "";
|
|
82
|
+
if (cspUser.subscriptionId) {
|
|
83
|
+
subx = ((cspUser.provider == contracts_1.CloudProviderEnum.aws) ? "acct" : "subx").concat(": ", cspUser.subscriptionId);
|
|
84
|
+
subx = "(".concat(subx, ")");
|
|
85
|
+
}
|
|
86
|
+
this._ui.userMessage(this._styler.colorGood("Success!").concat(" Authenticated with ", provider, " as ", this._styler.hilite(cspUser.username), subx));
|
|
82
87
|
}
|
|
83
88
|
catch (err) {
|
|
84
89
|
this._ui.userMessage(`${this._styler.colorCritical("FAILED")} ${(_b = err.name) !== null && _b !== void 0 ? _b : ""} ${(_c = err.message) !== null && _c !== void 0 ? _c : ""}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/csp/login.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/csp/login.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/deploy.js
CHANGED
|
@@ -204,15 +204,16 @@ class Deploy extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
204
204
|
promptForVersion(enterpriseCode, asset, versionSearch) {
|
|
205
205
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
206
206
|
return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
207
|
-
var _a;
|
|
207
|
+
var _a, _b;
|
|
208
208
|
try {
|
|
209
|
-
let
|
|
209
|
+
let providerSubscriptionId = (_a = asset.image.registry.accountId) !== null && _a !== void 0 ? _a : asset.image.registry.subscriptionId;
|
|
210
|
+
yield this.cspContextualizer.promptForCloudProviderCreds(this.ioc, asset.image.registry.provider, undefined, undefined, undefined, providerSubscriptionId);
|
|
210
211
|
this._ui.startSpinner("Loading versions...");
|
|
211
212
|
// let sorted = await this.relayClient.fetchVersions(asset.image, asset.type, versionSearch);
|
|
212
213
|
let result = yield this.genRelayClient.Call.FetchAssetVersions({ image: asset.image, assetType: asset.type, versionSearch: versionSearch });
|
|
213
214
|
if (result.error)
|
|
214
215
|
throw result.error;
|
|
215
|
-
let sorted = (
|
|
216
|
+
let sorted = (_b = result.output) !== null && _b !== void 0 ? _b : [];
|
|
216
217
|
let latest = sorted.length > 0 ? sorted[0] : undefined;
|
|
217
218
|
assetVersions = sorted.map(v => { return { value: v, name: v }; });
|
|
218
219
|
this._ui.stopSpinner(`found ${assetVersions.length}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ class FilestoreCapture extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
23
23
|
run() {
|
|
24
24
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
25
|
return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
|
-
var _a, _b;
|
|
26
|
+
var _a, _b, _c;
|
|
27
27
|
try {
|
|
28
28
|
this.bootstrap();
|
|
29
29
|
const { args, flags } = yield this.parse(FilestoreCapture);
|
|
@@ -40,10 +40,10 @@ class FilestoreCapture extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
40
40
|
let confirmed = false;
|
|
41
41
|
while (!confirmed) {
|
|
42
42
|
let csp = contracts_1.CloudProviderEnum.azure; // TODO: Add support for filestores in other csps
|
|
43
|
-
let
|
|
44
|
-
|
|
45
|
-
//
|
|
46
|
-
|
|
43
|
+
let cspUser = yield this.cspContextualizer.promptForCloudProviderCreds(this.ioc, csp, undefined, undefined, undefined, partial.providerSubscriptionId);
|
|
44
|
+
partial.providerSubscriptionId = (_a = cspUser.subscriptionId) !== null && _a !== void 0 ? _a : yield this.promptForSubscription(cspUser.username, partial.providerSubscriptionId);
|
|
45
|
+
// FROM HERE ON, THIS IS JUST AZURE'S FILESTORE CONFIGURATOR...
|
|
46
|
+
// TODO: Need a FileStore configurator factory (example: extend LoginUiFactory) (example: IClusterConfigurator)
|
|
47
47
|
// Storage Account
|
|
48
48
|
// let authenticator = new AzureAuthenticator(this.logger);
|
|
49
49
|
// let client = new AzureStorageClient(authenticator, this.logger);
|
|
@@ -87,7 +87,7 @@ class FilestoreCapture extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
87
87
|
this.logger.debug(`Error retrieving filestores (you or your machine may not have access to list them: ${err.message || "err.stack"}`, err);
|
|
88
88
|
this._ui.userMessage(`We are having trouble listing the fileshares in storage account [${storage.name}].`);
|
|
89
89
|
let fileshareName = (yield this._ui.prompt("fileshareName", `Please manually enter the fileshare name`, true, storage.name));
|
|
90
|
-
candidate = this.buildFileStoreDef(partial.providerSubscriptionId, storage, rg, accountKey, (
|
|
90
|
+
candidate = this.buildFileStoreDef(partial.providerSubscriptionId, storage, rg, accountKey, (_b = partial.shareName) !== null && _b !== void 0 ? _b : fileshareName);
|
|
91
91
|
}
|
|
92
92
|
if (fileStores !== undefined) {
|
|
93
93
|
if (fileStores.length > 0) {
|
|
@@ -100,7 +100,7 @@ class FilestoreCapture extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
100
100
|
}
|
|
101
101
|
}
|
|
102
102
|
if (candidate && candidate.instance) {
|
|
103
|
-
candidate.name = (yield this._ui.prompt("name", "Refer to as:", true, (
|
|
103
|
+
candidate.name = (yield this._ui.prompt("name", "Refer to as:", true, (_c = partial.name) !== null && _c !== void 0 ? _c : candidate.shareName));
|
|
104
104
|
// candidate.instance.accessKey = (await this._ui.prompt("accessKey", "Access Key for this filestore"))!;
|
|
105
105
|
// Confirm
|
|
106
106
|
console.clear();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../../src/commands/filestore/capture.ts"],"names":[],"mappings":";;;;AAAA,sCAA4C;AAE5C,iEAAyF;AACzF,2EAAsE;AACtE,6CAA0C;AAK1C,MAAa,kBAAkB;IAE3B,YACW,UAAkB,EAClB,QAAgB,EAChB,OAAiC,EACjC,WAAgE;QAHhE,eAAU,GAAV,UAAU,CAAQ;QAClB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,YAAO,GAAP,OAAO,CAA0B;QACjC,gBAAW,GAAX,WAAW,CAAqD;IAG3E,CAAC;CACJ;AAVD,gDAUC;AAGD,MAAqB,gBAAiB,SAAQ,+CAAqB;IAAnE;;QAuLY,eAAU,GAA+E,EAAE,CAAC;IA2MxG,CAAC;IA9WS,GAAG;;YACL,OAAO,IAAI,OAAO,CAAO,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;;gBAC/C,IAAI;oBACA,IAAI,CAAC,SAAS,EAAE,CAAC;oBACjB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;oBAE3D,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBACnE,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;oBAExE,IAAI,OAAO,GAA0B,EAAE,CAAC;oBACxC,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;oBAC1B,OAAO,CAAC,sBAAsB,GAAG,KAAK,CAAC,sBAAsB,CAAC;oBAC9D,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC;oBAC5C,OAAO,CAAC,cAAc,GAAG,KAAK,CAAC,cAAc,CAAC;oBAC9C,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;oBAEpC,IAAI,SAAmC,CAAC;oBACxC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;wBACf,IAAI,SAAS,GAAG,KAAK,CAAC;wBACtB,OAAO,CAAC,SAAS,EAAE;4BAEf,IAAI,GAAG,GAAG,6BAAiB,CAAC,KAAK,CAAC,CAAE,iDAAiD;4BACrF,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;4BAErF,mCAAmC;4BAEnC,8BAA8B;4BAC9B,OAAO,CAAC,sBAAsB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;4BAE1G,kBAAkB;4BAClB,2DAA2D;4BAC3D,mEAAmE;4BACnE,kFAAkF;4BAElF,sGAAsG;4BACtG,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,kBAAkB,CAAC;gCAC7D,QAAQ,EAA0B,GAAG,CAAE,mCAAmC;gCAC1E,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;6BACzD,CAAC,CAAC;4BAEH,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gCAEnE,IAAI,OAAO,GAAsB,CAAC,QAAQ,CAAC,MAAM,CAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gCACrE,IAAI,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAS,gBAAgB,EAAE,4BAA4B,EAAE,OAAO,CAAC,CAAE,CAAC;gCAClH,IAAI,OAAO,GAAsB,CAAC,QAAQ,CAAC,MAAM,CAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,WAAW,CAAE,CAAC,CAAE,4DAA4D;gCACpJ,iIAAiI;gCACjI,IAAI,EAAE,GAAG,IAAI,MAAM,CAAC,8BAA8B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAG,CAAE,CAAC,CAAC,CAAC,CAAC;gCAE1E,sBAAsB;gCACtB,mHAAmH;gCACnH,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,qBAAqB,CAAC;oCAClE,+EAA+E;oCAC/E,QAAQ,EAA0B,GAAG;oCACrC,cAAc,EAAE,OAAO,CAAC,sBAAsB;oCAC9C,aAAa,EAAE,EAAE;oCACjB,kBAAkB,EAAE,OAAO,CAAC,IAAI;iCACnC,CAAC,CAAC;gCAEH,IAAI,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;oCACzE,IAAI,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;oCAE5C,aAAa;oCACb,IAAI,UAAsC,CAAC;oCAC3C,IAAI;wCACA,IAAI,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC;4CAC/D,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;4CACtD,cAAc,EAAE,OAAO;4CACvB,aAAa,EAAE,EAAE;4CACjB,UAAU,EAAE,UAAU;yCACzB,CAAC,CAAC;wCACH,IAAI,eAAe,CAAC,KAAK;4CAAE,MAAM,eAAe,CAAC,KAAK,CAAC;wCACvD,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC;qCACvC;oCAAC,OAAO,GAAQ,EAAE;wCACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sFAAsF,GAAG,CAAC,OAAO,IAAI,WAAW,EAAE,EAAE,GAAG,CAAC,CAAC;wCAC3I,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,oEAAoE,OAAO,CAAC,IAAI,IAAI,CAAC,CAAA;wCAC1G,IAAI,aAAa,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,0CAA0C,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAE,CAAC;wCAC9H,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,sBAAsB,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,MAAA,OAAO,CAAC,SAAS,mCAAI,aAAa,CAAC,CAAC;qCACnI;oCACD,IAAI,UAAU,KAAK,SAAS,EAAE;wCAC1B,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;4CACvB,oDAAoD;4CACpD,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,YAAY,EAAE,qBAAqB,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;4CAC3G,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,MAAM,CAAE,CAAC,CAAE,kDAAkD;yCAC3G;6CAAM;4CACH,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,8CAA8C,CAAC,CAAC;yCACxE;qCACJ;oCAED,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,EAAE;wCACjC,SAAS,CAAC,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,SAAU,CAAC,SAAS,CAAC,CAAE,CAAC;wCAC9G,yGAAyG;wCAEzG,UAAU;wCACV,OAAO,CAAC,KAAK,EAAE,CAAC;wCAChB,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAA,mBAAQ,EAAC,SAAS,CAAC,CAAC,CAAA;wCACzC,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,WAAW,EAAE,sBAAsB,SAAS,CAAC,cAAc,IAAI,SAAS,CAAC,SAAS,qBAAqB,EAAE,IAAI,CAAC,CAAC;qCAC3J;iCAEJ;6BACJ;iCAAM,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS,EAAE;gCACrC,MAAM,QAAQ,CAAC,KAAK,CAAC;6BACxB;iCAAM;gCACH,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,0CAA0C,CAAC,CAAC;gCACjE,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;6BAC9C;yBAIJ;qBAGJ;oBAED,mDAAmD;oBAEnD,IAAI,SAAS,EAAE;wBACX,6CAA6C;wBAE7C,+KAA+K;wBAC/K,wFAAwF;wBACxF,+BAA+B;wBAC/B,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;wBACzC,WAAW;wBACX,kEAAkE;wBAClE,oEAAoE;wBACpE,IAAI;qBAEP;oBAGD,OAAO,EAAE,CAAC;iBACb;gBAAC,OAAO,GAAQ,EAAE;oBACf,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;oBACtB,OAAO,EAAE,CAAC;iBACb;YACL,CAAC,CAAA,CAAC,CAAC;QACP,CAAC;KAAA;IAID,kEAAkE;IACpD,eAAe,CAAC,SAA6B,EAAE,YAAiC,EAAE,mBAAwC;;YACpI,IAAI;gBACA,IAAI,MAAc,CAAC;gBAEnB,IAAI,WAAW,GAAG,KAAK,CAAC;gBACxB,IAAI,YAAY,IAAI,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;oBACjD,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,SAAS,CAAC,QAAQ,EAAE,EAAE,GAAG,SAAS,CAAC,UAAU,KAAK,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,YAAY,EAAE,CAAC,CAAC;iBAC9I;gBACD,IAAI,WAAW,KAAK,IAAI,IAAI,YAAY,KAAK,SAAS,EAAE;oBACpD,MAAM,GAAG,YAAY,CAAC;iBACzB;qBAAM;oBACH,MAAM,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;iBACtD;gBAED,OAAO,MAAM,CAAC;aACjB;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,GAAG,CAAC;aACb;QACL,CAAC;KAAA;IAQa,qBAAqB,CAAC,MAAc,EAAE,YAAqB;;;YACrE,IAAI;gBACA,IAAI,MAAc,CAAC;gBAEnB,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,KAAK,SAAS,EAAE;oBAC7C,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;oBAC1F,IAAI,UAAU,CAAC,KAAK;wBAAE,MAAM,UAAU,CAAC,KAAK,CAAC;oBAC7C,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,MAAA,UAAU,CAAC,MAAM,mCAAI,EAAE,CAAC;iBAC3D;gBACD,IAAI,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;gBAC1C,IAAI,IAAI,GAAG,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC7F,IAAI,mBAAmB,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAK,CAAC,IAAI,CAAC,KAAK,IAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;gBAEhH,IAAI,SAAS,GAAuB;oBAChC,QAAQ,EAAE,QAAQ;oBAClB,UAAU,EAAE,uBAAuB;oBACnC,OAAO,EAAE,CAAC,UAA8B,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC;oBACxE,WAAW,EAAE,CAAO,UAA8B,EAAE,EAAE;wBAClD,IAAI,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAA,CAAC,CAAC,CAAC,CAAC;wBACnG,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAS,wBAAwB,EAAE,wCAAwC,EAAE,OAAO,CAAC,CAAE,CAAC;wBAC7H,OAAO,MAAM,CAAC;oBAClB,CAAC,CAAA;iBACJ,CAAA;gBACD,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAC;gBAElF,8DAA8D;gBAE9D,2BAA2B;gBAC3B,+CAA+C;gBAC/C,2IAA2I;gBAC3I,IAAI;gBACJ,4DAA4D;gBAC5D,6BAA6B;gBAC7B,WAAW;gBACX,0GAA0G;gBAC1G,oIAAoI;gBACpI,IAAI;gBAEJ,OAAO,MAAM,CAAC;aACjB;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,GAAG,CAAC;aACb;;KACJ;IAID,oEAAoE;IACpE,8KAA8K;IAE9K,gCAAgC;IAChC,yBAAyB;IACzB,+BAA+B;IAC/B,0DAA0D;IAC1D,wCAAwC;IACxC,+CAA+C;IAC/C,oCAAoC;IACpC,oDAAoD;IACpD,sBAAsB;IACtB,qCAAqC;IACrC,8DAA8D;IAC9D,4CAA4C;IAC5C,6CAA6C;IAC7C,aAAa;IACb,yCAAyC;IACzC,8CAA8C;IAC9C,0CAA0C;IAC1C,8CAA8C;IAC9C,SAAS;IAET,kBAAkB;IAClB,IAAI;IAGJ,2FAA2F;IAC3F,4BAA4B;IAC5B,KAAK;IACL,oFAAoF;IACpF,uHAAuH;IACvH,KAAK;IACL,sDAAsD;IACtD,KAAK;IACL,6rBAA6rB;IAC7rB,MAAM;IACN,uKAAuK;IACvK,sEAAsE;IACtE,4CAA4C;IAC5C,gBAAgB;IAEhB,4BAA4B;IAC5B,sGAAsG;IACtG,4BAA4B;IAC5B,gQAAgQ;IAChQ,2zDAA2zD;IAC3zD,qFAAqF;IACrF,2FAA2F;IAE3F,oHAAoH;IAEpH,2DAA2D;IAC3D,iHAAiH;IACjH,uBAAuB;IACvB,6IAA6I;IAC7I,0FAA0F;IAC1F,iEAAiE;IACjE,6BAA6B;IAC7B,4DAA4D;IAC5D,mEAAmE;IACnE,2IAA2I;IAC3I,yCAAyC;IACzC,2BAA2B;IAC3B,oBAAoB;IACpB,gBAAgB;IAEhB,gCAAgC;IAChC,0BAA0B;IAC1B,2BAA2B;IAC3B,YAAY;IACZ,UAAU;IACV,IAAI;IAGU,kBAAkB,CAAC,SAAuB;;YACpD,OAAO,IAAI,OAAO,CAAO,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;;gBAC/C,IAAI;oBACA,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;oBACrE,IAAI,MAAM,CAAC,KAAK;wBAAE,MAAM,MAAM,CAAC,KAAK,CAAC;oBACrC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM;wBAAE,MAAM,IAAI,KAAK,CAAC,qDAAqD,SAAS,CAAC,IAAI,MAAM,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;oBAElJ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,oCAAoC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;oBACtK,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,oCAAoC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;oBAEzJ,OAAO,EAAE,CAAC;iBACb;gBAAC,OAAO,GAAQ,EAAE;oBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAA,MAAA,GAAG,CAAC,OAAO,mCAAI,GAAG,CAAC,KAAK,mCAAI,GAAG,EAAE,SAAS,CAAC,CAAC;oBAC9D,OAAO,EAAE,CAAC;oBACV,eAAe;iBAClB;YACL,CAAC,CAAA,CAAC,CAAC;QACP,CAAC;KAAA;IAGD,qBAAqB;IACrB,6FAA6F;IAC7F,yGAAyG;IACzG,8GAA8G;IAC9G,oFAAoF;IACpF,gBAAgB;IAEhB,uCAAuC;IACvC,mDAAmD;IACnD,sDAAsD;IAEtD,yEAAyE;IACzE,4EAA4E;IAC5E,6EAA6E;IAC7E,mIAAmI;IAEnI,mCAAmC;IACnC,yGAAyG;IACzG,mGAAmG;IACnG,uBAAuB;IACvB,2CAA2C;IAC3C,8CAA8C;IAC9C,oCAAoC;IACpC,gBAAgB;IAEhB,0BAA0B;IAC1B,2BAA2B;IAC3B,YAAY;IACZ,UAAU;IACV,IAAI;IAGJ,iEAAiE;IACzD,iBAAiB,CAAC,sBAA8B,EAAE,cAA8B,EAAE,aAAqB,EAAE,UAAkB,EAAE,aAAqB;QAEtJ,IAAI,GAAG,GAAiB;YACpB,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,aAAa;YACnB,sBAAsB,EAAE,sBAAsB;YAC9C,aAAa,EAAE,aAAa;YAC5B,cAAc,EAAE,cAAc,CAAC,IAAI;YACnC,SAAS,EAAE,aAAa;YACxB,IAAI,EAAE,6BAAiB,CAAC,gBAAgB;YACxC,QAAQ,EAAE;gBACN,SAAS,EAAE,UAAU;gBACrB,sBAAsB,EAAE,sBAAsB;gBAC9C,aAAa,EAAE,aAAa;gBAC5B,UAAU,EAAE,cAAc,CAAC,EAAG;aACjC;YACD,OAAO,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ;YAClC,QAAQ,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YAC9B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ;SACtC,CAAC;QAEF,OAAO,GAAG,CAAC;IACf,CAAC;;AAhYL,mCAkYC;AAjYU,4BAAW,GAAG,wHAAwH,CAAC;AACvI,wBAAO,GAAG,CAAC,mBAAmB,CAAC,CAAC;AAEhC,0BAAS,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,WAAW,EAAE,wBAAwB,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;AAEvH,sBAAK,GAAG;IACX,IAAI,EAAE,YAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAC/B,UAAU,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,4GAA4G,EAAE,CAAC;IACnL,IAAI,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,sHAAsH,EAAE,CAAC;IACvL,sBAAsB,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,iGAAiG,EAAE,CAAC;IACzK,aAAa,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,mGAAmG,EAAE,CAAC;IAClK,cAAc,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,gGAAgG,EAAE,CAAC;IAChK,SAAS,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,0EAA0E,EAAE,CAAC;IACrI,+IAA+I;IAC/I,yJAAyJ;IACzJ,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,gBAAgB,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,sHAAsH,gBAAgB,CAAC,SAAS,EAAE,EAAE,CAAC;CAChQ,CAAA"}
|
|
1
|
+
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../../src/commands/filestore/capture.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,7 +64,11 @@ class NocClusterCreate extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
64
64
|
// TODO: ask to change before prompting the list
|
|
65
65
|
let allPvds = this.cspUiFactory.getAllProviders(this.ioc);
|
|
66
66
|
cluster.provider = yield this.uiCloudPvd.promptForCloudProvider(allPvds, cluster.provider);
|
|
67
|
-
yield this.uiCloudPvd.promptForCloudProviderCreds(this.ioc, cluster.provider);
|
|
67
|
+
let cspUser = yield this.uiCloudPvd.promptForCloudProviderCreds(this.ioc, cluster.provider, undefined, undefined, undefined, cluster.providerSubscription);
|
|
68
|
+
// Adhere to the subscription of the current csp user (if any specified).
|
|
69
|
+
if (cluster.providerSubscription == undefined && cspUser.subscriptionId) {
|
|
70
|
+
cluster.providerSubscription = cspUser.subscriptionId;
|
|
71
|
+
}
|
|
68
72
|
// load up the cluster configurator for the given clouduprovider
|
|
69
73
|
let regCfg = this.cspUiFactory.create(cluster.provider, this.ioc);
|
|
70
74
|
let def = yield regCfg.defineCluster(cluster, defaults); // note: "defaults" gets mutated here
|