@codiac.io/codiac-cli 1.3.56 → 1.3.59
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/apis/codiac-api/gen/contracts.d.ts +39 -4
- package/dist/apis/codiac-api/gen/contracts.js +3 -0
- package/dist/apis/codiac-api/gen/contracts.js.map +1 -1
- package/dist/apis/codiac-relay/gen/client.d.ts +6 -4
- package/dist/apis/codiac-relay/gen/client.js +18 -4
- package/dist/apis/codiac-relay/gen/client.js.map +1 -1
- package/dist/apis/codiac-relay/gen/contracts.d.ts +55 -8
- package/dist/apis/codiac-relay/gen/contracts.js +3 -0
- package/dist/apis/codiac-relay/gen/contracts.js.map +1 -1
- package/dist/command-base-enterprise.d.ts +4 -1
- package/dist/command-base-enterprise.js +9 -2
- package/dist/command-base-enterprise.js.map +1 -1
- package/dist/command-base-exec.js +9 -1
- package/dist/command-base-exec.js.map +1 -1
- package/dist/commands/asset/deploy.js +4 -1
- package/dist/commands/asset/deploy.js.map +1 -1
- package/dist/commands/asset/list.js +2 -1
- package/dist/commands/asset/list.js.map +1 -1
- package/dist/commands/asset/probe/create.js +2 -1
- package/dist/commands/asset/probe/create.js.map +1 -1
- package/dist/commands/asset/recycle.js +3 -2
- package/dist/commands/asset/recycle.js.map +1 -1
- package/dist/commands/asset/undeploy.js +2 -1
- package/dist/commands/asset/undeploy.js.map +1 -1
- package/dist/commands/asset/view.js +2 -2
- package/dist/commands/asset/view.js.map +1 -1
- package/dist/commands/asset/volume/create.js +2 -1
- package/dist/commands/asset/volume/create.js.map +1 -1
- package/dist/commands/asset/volume/delete.js +2 -1
- package/dist/commands/asset/volume/delete.js.map +1 -1
- package/dist/commands/asset/volume/list.js +2 -1
- package/dist/commands/asset/volume/list.js.map +1 -1
- package/dist/commands/cabinet/list.js +2 -1
- package/dist/commands/cabinet/list.js.map +1 -1
- package/dist/commands/cabinet/obliterate.js +2 -1
- package/dist/commands/cabinet/obliterate.js.map +1 -1
- package/dist/commands/cluster/connect.d.ts +2 -0
- package/dist/commands/cluster/connect.js +7 -1
- package/dist/commands/cluster/connect.js.map +1 -1
- package/dist/commands/config/add.js +5 -11
- package/dist/commands/config/add.js.map +1 -1
- package/dist/commands/config/delete.js +1 -1
- package/dist/commands/config/delete.js.map +1 -1
- package/dist/commands/config/deploy.js +2 -1
- package/dist/commands/config/deploy.js.map +1 -1
- package/dist/commands/config/import.js +2 -1
- package/dist/commands/config/import.js.map +1 -1
- package/dist/commands/config/settings/get.js +1 -1
- package/dist/commands/config/settings/get.js.map +1 -1
- package/dist/commands/config/view.js +2 -1
- package/dist/commands/config/view.js.map +1 -1
- package/dist/commands/deploy.js +2 -1
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/env/add.js +2 -1
- package/dist/commands/env/add.js.map +1 -1
- package/dist/commands/environment/list.js +2 -1
- package/dist/commands/environment/list.js.map +1 -1
- package/dist/commands/filestore/capture.d.ts +26 -7
- package/dist/commands/filestore/capture.js +174 -258
- package/dist/commands/filestore/capture.js.map +1 -1
- package/dist/commands/filestore/list.js +7 -3
- package/dist/commands/filestore/list.js.map +1 -1
- package/dist/commands/kit/create.js +4 -3
- package/dist/commands/kit/create.js.map +1 -1
- package/dist/commands/noc/cluster/deinit.js +1 -1
- package/dist/commands/noc/cluster/deinit.js.map +1 -1
- package/dist/commands/noc/cluster/forget.d.ts +1 -0
- package/dist/commands/noc/cluster/forget.js +5 -3
- package/dist/commands/noc/cluster/forget.js.map +1 -1
- package/dist/commands/noc/cluster/init.js +26 -6
- package/dist/commands/noc/cluster/init.js.map +1 -1
- package/dist/commands/secretStore/capture.d.ts +0 -3
- package/dist/commands/secretStore/capture.js +2 -18
- package/dist/commands/secretStore/capture.js.map +1 -1
- package/dist/ops/k8s/k8s-utils.d.ts +1 -1
- package/dist/ops/k8s/k8s-utils.js +5 -2
- package/dist/ops/k8s/k8s-utils.js.map +1 -1
- package/dist/ops/throwing-user-input-provider.js +11 -9
- package/dist/ops/throwing-user-input-provider.js.map +1 -1
- package/dist/relay/contracts/contracts.d.ts +1 -53
- package/dist/relay/contracts/contracts.js +61 -60
- package/dist/relay/contracts/contracts.js.map +1 -1
- package/dist/relay/relay-container.js +1 -1
- package/dist/uilogic/cloud-resource-configurator-factory.d.ts +10 -0
- package/dist/uilogic/cloud-resource-configurator-factory.js +32 -1
- package/dist/uilogic/cloud-resource-configurator-factory.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/aws-resource-configurator.d.ts +5 -2
- package/dist/uilogic/cloud-resource-configurators/aws-resource-configurator.js +55 -0
- package/dist/uilogic/cloud-resource-configurators/aws-resource-configurator.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/azure-resource-configurator.d.ts +13 -1
- package/dist/uilogic/cloud-resource-configurators/azure-resource-configurator.js +172 -0
- package/dist/uilogic/cloud-resource-configurators/azure-resource-configurator.js.map +1 -1
- package/dist/uilogic/config-ui-utils.d.ts +3 -1
- package/dist/uilogic/config-ui-utils.js +5 -3
- package/dist/uilogic/config-ui-utils.js.map +1 -1
- package/dist/uilogic/enterprise-contextualizer.js +5 -0
- package/dist/uilogic/enterprise-contextualizer.js.map +1 -1
- package/dist/uilogic/i-file-store-configurator.d.ts +6 -0
- package/dist/uilogic/i-file-store-configurator.js +3 -0
- package/dist/uilogic/i-file-store-configurator.js.map +1 -0
- package/dist/uilogic/index.d.ts +1 -0
- package/dist/uilogic/index.js +1 -0
- package/dist/uilogic/index.js.map +1 -1
- package/dist/uilogic/lrp-watcher-predef.d.ts +8 -0
- package/dist/uilogic/lrp-watcher-predef.js +75 -64
- package/dist/uilogic/lrp-watcher-predef.js.map +1 -1
- package/dist/uilogic/rootmap-ui-utils.d.ts +3 -1
- package/dist/uilogic/rootmap-ui-utils.js +8 -3
- package/dist/uilogic/rootmap-ui-utils.js.map +1 -1
- package/oclif.manifest.json +76 -29
- package/package.json +3 -3
|
@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.PromptDefForString = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const core_1 = require("@oclif/core");
|
|
6
|
-
const _ = require("lodash");
|
|
7
6
|
const contracts_1 = require("../../apis/codiac-relay/contracts");
|
|
8
|
-
const command_base_enterprise_1 = require("../../command-base-enterprise");
|
|
9
7
|
const prettify_1 = require("../../prettify");
|
|
8
|
+
const command_base_exec_1 = require("../../command-base-exec");
|
|
9
|
+
const uilogic_1 = require("../../uilogic");
|
|
10
10
|
class PromptDefForString {
|
|
11
11
|
constructor(promptText, promptId, isValid, getFromUser) {
|
|
12
12
|
this.promptText = promptText;
|
|
@@ -16,132 +16,179 @@ class PromptDefForString {
|
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
exports.PromptDefForString = PromptDefForString;
|
|
19
|
-
class FilestoreCapture extends
|
|
19
|
+
class FilestoreCapture extends command_base_exec_1.CommandBaseExec {
|
|
20
20
|
constructor() {
|
|
21
21
|
super(...arguments);
|
|
22
22
|
this.localCache = {};
|
|
23
|
+
// COMMENTED OUT BC: not in use.
|
|
24
|
+
// /** Factory method for building a FileStoreDef from a fileshare */
|
|
25
|
+
// private buildFileStoreDef(provider: CloudProviderEnum, providerSubscriptionId: string, storageAccount: StorageAccount, resourceGroup: string, accountKey: string, fileShareName: string): FileStoreDef {
|
|
26
|
+
// let def: FileStoreDef = {
|
|
27
|
+
// id: undefined,
|
|
28
|
+
// name: fileShareName,
|
|
29
|
+
// provider: provider,
|
|
30
|
+
// providerSubscriptionId: providerSubscriptionId,
|
|
31
|
+
// resourceGroup: resourceGroup,
|
|
32
|
+
// storageAccount: storageAccount.name,
|
|
33
|
+
// shareName: fileShareName,
|
|
34
|
+
// type: FileStoreTypeEnum.AzureFileStorage,
|
|
35
|
+
// instance: {
|
|
36
|
+
// accessKey: accountKey,
|
|
37
|
+
// providerSubscriptionId: providerSubscriptionId,
|
|
38
|
+
// resourceGroup: resourceGroup,
|
|
39
|
+
// resourceId: storageAccount.id!
|
|
40
|
+
// },
|
|
41
|
+
// created: new Date(Date.now()),
|
|
42
|
+
// createdBy: this._userCntx.userName,
|
|
43
|
+
// modified: new Date(Date.now()),
|
|
44
|
+
// modifiedBy: this._userCntx.userName
|
|
45
|
+
// };
|
|
46
|
+
// return def;
|
|
47
|
+
// }
|
|
23
48
|
}
|
|
24
|
-
|
|
49
|
+
bootstrap() {
|
|
50
|
+
super.bootstrap();
|
|
51
|
+
uilogic_1.FileStoreConfiguratorFactory.bootstrap(this.ioc);
|
|
52
|
+
}
|
|
53
|
+
get filestoreUiFactory() {
|
|
54
|
+
if (this.__filestoreUiFactory == undefined) {
|
|
55
|
+
this.__filestoreUiFactory = new uilogic_1.FileStoreConfiguratorFactory(this.ioc);
|
|
56
|
+
}
|
|
57
|
+
return this.__filestoreUiFactory;
|
|
58
|
+
}
|
|
59
|
+
get fileStoreCspMap() {
|
|
60
|
+
if (this.__fileStoreCspMap == undefined) {
|
|
61
|
+
this.__fileStoreCspMap = {
|
|
62
|
+
[contracts_1.FileStoreTypeEnum.AzureBlobStorage]: contracts_1.CloudProviderEnum.azure,
|
|
63
|
+
[contracts_1.FileStoreTypeEnum.AzureDisk]: contracts_1.CloudProviderEnum.azure,
|
|
64
|
+
[contracts_1.FileStoreTypeEnum.AzureFileStorage]: contracts_1.CloudProviderEnum.azure,
|
|
65
|
+
[contracts_1.FileStoreTypeEnum.AwsEfs]: contracts_1.CloudProviderEnum.aws,
|
|
66
|
+
[contracts_1.FileStoreTypeEnum.AwsEbs]: contracts_1.CloudProviderEnum.aws,
|
|
67
|
+
[contracts_1.FileStoreTypeEnum.AwsS3Bucket]: contracts_1.CloudProviderEnum.aws,
|
|
68
|
+
[contracts_1.FileStoreTypeEnum.HostMachineFolder]: contracts_1.CloudProviderEnum.other
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
return this.__fileStoreCspMap;
|
|
72
|
+
}
|
|
73
|
+
captureArgs() {
|
|
74
|
+
var _a;
|
|
25
75
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
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
|
-
providerSubscriptionId: partial.providerSubscriptionId
|
|
58
|
-
});
|
|
59
|
-
if (saResult.success && saResult.output && saResult.output.length > 0) {
|
|
60
|
-
let choices = (saResult.output).map(x => x.name);
|
|
61
|
-
let storageName = (yield this._ui.promptSelect("storageAccount", "select the storage account", choices));
|
|
62
|
-
let storage = (saResult.output).find(x => x.name == storageName); // these casts may be due to muiltiple copies of the entity)
|
|
63
|
-
// We have to parse the resourceGroup out of the id bc M$ doesnt return it anywhere else. Yeah, dont you just love those guys :|
|
|
64
|
-
let rg = new RegExp(/\/resourceGroups\/([^\/]+)\//).exec(storage.id)[1];
|
|
65
|
-
// Storage Account Key
|
|
66
|
-
// let keyResults = await this.relayclient.getStorageAccountKeys(partial.providerSubscriptionId, rg, storage.name);
|
|
67
|
-
let keyResults = yield this.genRelayClient.Call.GetStorageAccountKeys({
|
|
68
|
-
// provider: (<any>CloudProviderEnum)[csp], // <-- will this throw if invalid?
|
|
69
|
-
provider: csp,
|
|
70
|
-
subscriptionId: partial.providerSubscriptionId,
|
|
71
|
-
resourceGroup: rg,
|
|
72
|
-
storageAccountName: storage.name
|
|
73
|
-
});
|
|
74
|
-
if (keyResults.success && keyResults.output && keyResults.output.length > 0) {
|
|
75
|
-
let accountKey = keyResults.output[0].value;
|
|
76
|
-
// File Store
|
|
77
|
-
let fileStores;
|
|
78
|
-
try {
|
|
79
|
-
let fileStoreResult = yield this.genRelayClient.Call.GetFileStores({
|
|
80
|
-
providerSubscriptionId: partial.providerSubscriptionId,
|
|
81
|
-
storageAccount: storage,
|
|
82
|
-
resourceGroup: rg,
|
|
83
|
-
accountKey: accountKey
|
|
84
|
-
});
|
|
85
|
-
if (fileStoreResult.error)
|
|
86
|
-
throw fileStoreResult.error;
|
|
87
|
-
fileStores = fileStoreResult.output;
|
|
88
|
-
}
|
|
89
|
-
catch (err) {
|
|
90
|
-
this.logger.debug(`Error retrieving filestores (you or your machine may not have access to list them: ${err.message || "err.stack"}`, err);
|
|
91
|
-
this._ui.userMessage(`We are having trouble listing the fileshares in storage account [${storage.name}].`);
|
|
92
|
-
let fileshareName = (yield this._ui.prompt("fileshareName", `Please manually enter the fileshare name`, true, storage.name));
|
|
93
|
-
candidate = this.buildFileStoreDef(partial.providerSubscriptionId, storage, rg, accountKey, (_b = partial.shareName) !== null && _b !== void 0 ? _b : fileshareName);
|
|
94
|
-
}
|
|
95
|
-
if (fileStores !== undefined) {
|
|
96
|
-
if (fileStores.length > 0) {
|
|
97
|
-
// TODO: get the one they called out for in the args
|
|
98
|
-
let fsName = yield this._ui.promptSelect("resourceId", "Select a file store", fileStores.map(f => f.name));
|
|
99
|
-
candidate = fileStores.find(f => f.name == fsName); // we can force this - we selected from this list.
|
|
100
|
-
}
|
|
101
|
-
else {
|
|
102
|
-
this._ui.userMessage(`No filestores found in that storage account.`);
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
if (candidate && candidate.instance) {
|
|
106
|
-
candidate.name = (yield this._ui.prompt("name", "Refer to as:", true, (_c = partial.name) !== null && _c !== void 0 ? _c : candidate.shareName));
|
|
107
|
-
// candidate.instance.accessKey = (await this._ui.prompt("accessKey", "Access Key for this filestore"))!;
|
|
108
|
-
// Confirm
|
|
109
|
-
console.clear();
|
|
110
|
-
this._ui.userMessage((0, prettify_1.prettify)(candidate));
|
|
111
|
-
confirmed = yield this._ui.promptConfirm("filestore", `You have selected [${candidate.storageAccount}/${candidate.shareName}]. Is this correct?`, true);
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
else if (saResult.error !== undefined) {
|
|
116
|
-
throw saResult.error;
|
|
117
|
-
}
|
|
118
|
-
else {
|
|
119
|
-
this._ui.userMessage(`No filestores found in that subscription`);
|
|
120
|
-
partial.providerSubscriptionId = undefined;
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
// TODO: if silent, convert partial to a candidate.
|
|
125
|
-
if (candidate) {
|
|
126
|
-
// this._ui.userMessage(prettify(candidate));
|
|
127
|
-
// this._ui.userMessage(`You are about to add this new filestore as ${this._styler.bold(this._styler.hilite(candidate.name))} [Tenant: ${this._userCntx.currentTenantCode}].`);
|
|
128
|
-
// let confirmResult = await this._ui.promptConfirm("confirmCapture","Continue?", false)
|
|
129
|
-
// if (confirmResult == true) {
|
|
130
|
-
yield this.createFileStoreDef(candidate);
|
|
131
|
-
// } else {
|
|
132
|
-
// this.logger.notice(`Operation cancelled. No work was done.`);
|
|
133
|
-
// this._ui.userMessage(`Operation cancelled. No work was done.`);
|
|
134
|
-
// }
|
|
135
|
-
}
|
|
136
|
-
resolve();
|
|
76
|
+
const { args, flags } = yield this.parse(FilestoreCapture);
|
|
77
|
+
let partial = {};
|
|
78
|
+
partial.enterprise = flags.enterprise;
|
|
79
|
+
partial.name = flags.name;
|
|
80
|
+
if (flags.provider)
|
|
81
|
+
partial.provider = contracts_1.CloudProviderEnum[flags.provider];
|
|
82
|
+
partial.providerSubscriptionId = flags.providerSubscriptionId;
|
|
83
|
+
partial.shareName = flags.shareName;
|
|
84
|
+
if (partial.provider == contracts_1.CloudProviderEnum.azure) {
|
|
85
|
+
partial.resourceGroup = flags.resourceGroup;
|
|
86
|
+
partial.storageAccount = flags.storageAccount;
|
|
87
|
+
}
|
|
88
|
+
// ---------------------------------------------------------------
|
|
89
|
+
// TODO: turn this into setInteractionMode() and move everything from here down into the base class
|
|
90
|
+
// ---------------------------------------------------------------
|
|
91
|
+
const interactionMode = this.getInteractionMode(flags.silent, flags.echo, flags['to-script']);
|
|
92
|
+
const takeDefaults = (_a = flags['take-defaults']) !== null && _a !== void 0 ? _a : false;
|
|
93
|
+
return [partial, interactionMode, takeDefaults];
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
buildCandidate_silently(partial, rootMap) {
|
|
97
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
98
|
+
if (partial.enterprise == undefined || partial.enterprise.trim() == "")
|
|
99
|
+
throw new Error("Must provide enterprise.");
|
|
100
|
+
if (partial.name == undefined || partial.name.trim() == "")
|
|
101
|
+
throw new Error("Must provide name.");
|
|
102
|
+
if (partial.providerSubscriptionId == undefined || partial.providerSubscriptionId.trim() == "")
|
|
103
|
+
throw new Error("Must provide providerSubscriptionId.");
|
|
104
|
+
if (partial.provider == undefined || partial.provider.trim() == "") {
|
|
105
|
+
if (partial.type !== undefined) {
|
|
106
|
+
partial.provider = this.fileStoreCspMap[partial.type];
|
|
137
107
|
}
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
resolve();
|
|
108
|
+
else {
|
|
109
|
+
throw new Error("Must submit cloud provider.");
|
|
141
110
|
}
|
|
142
|
-
}
|
|
111
|
+
}
|
|
112
|
+
if (rootMap.enterprises.find(e => e.name == partial.enterprise) == undefined)
|
|
113
|
+
throw new Error("Enterprise not found."); // Enterprise contextualizer will already have done this for us, right?
|
|
114
|
+
let filestoreUi = yield this.filestoreUiFactory.create(partial.provider);
|
|
115
|
+
let fileStore = yield filestoreUi.captureFileStore(partial.providerSubscriptionId, partial, false);
|
|
116
|
+
if (fileStore == undefined)
|
|
117
|
+
throw new Error("Filestore not found.");
|
|
118
|
+
return Object.assign(Object.assign({}, fileStore), { enterprise: partial.enterprise, provider: partial.provider });
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
buildCandidate_interactively(partial, rootMap, takeDefaults) {
|
|
122
|
+
var _a;
|
|
123
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
124
|
+
try {
|
|
125
|
+
let fileStore;
|
|
126
|
+
let confirmed = false;
|
|
127
|
+
do {
|
|
128
|
+
// 1. Select a cloud resource provider
|
|
129
|
+
let choices = this.filestoreUiFactory.getAllProviders();
|
|
130
|
+
partial.provider = (yield this.cspContextualizer.promptForCloudProvider(choices, partial.provider));
|
|
131
|
+
// 2. Authenticate with the cloud resource provider
|
|
132
|
+
let cspUser = yield this.cspContextualizer.promptForCloudProviderCreds(this.ioc, partial.provider, undefined, undefined, undefined, partial.providerSubscriptionId);
|
|
133
|
+
partial.providerSubscriptionId = (_a = cspUser.subscriptionId) !== null && _a !== void 0 ? _a : yield this.promptForSubscription(cspUser.username, partial.providerSubscriptionId);
|
|
134
|
+
let filestoreUi = yield this.filestoreUiFactory.create(partial.provider);
|
|
135
|
+
fileStore = yield filestoreUi.captureFileStore(partial.providerSubscriptionId, partial, true);
|
|
136
|
+
// Confirm
|
|
137
|
+
if (fileStore) {
|
|
138
|
+
console.clear();
|
|
139
|
+
this._ui.userMessage((0, prettify_1.prettify)(fileStore));
|
|
140
|
+
confirmed = yield this._ui.promptConfirm("filestore", `You have selected [${fileStore.provider}/${fileStore.shareName}]. Is this correct?`, true);
|
|
141
|
+
}
|
|
142
|
+
} while ((confirmed != true) && (fileStore == undefined));
|
|
143
|
+
return Object.assign(Object.assign({}, fileStore), { enterprise: partial.enterprise, provider: partial.provider });
|
|
144
|
+
}
|
|
145
|
+
catch (err) {
|
|
146
|
+
throw err;
|
|
147
|
+
}
|
|
143
148
|
});
|
|
144
149
|
}
|
|
150
|
+
buildCommandString(candidate, cmd) {
|
|
151
|
+
cmd.push("--silent");
|
|
152
|
+
cmd.push("--enterprise", candidate.enterprise);
|
|
153
|
+
cmd.push("--name", candidate.name);
|
|
154
|
+
cmd.push("--provider", candidate.provider);
|
|
155
|
+
cmd.push("--providerSubscriptionId", candidate.providerSubscriptionId);
|
|
156
|
+
cmd.push("--shareName", candidate.shareName);
|
|
157
|
+
if (candidate.provider == contracts_1.CloudProviderEnum.azure) {
|
|
158
|
+
cmd.push("--resourceGroup", candidate.resourceGroup);
|
|
159
|
+
cmd.push("--storageAccount", candidate.storageAccount);
|
|
160
|
+
}
|
|
161
|
+
return cmd;
|
|
162
|
+
}
|
|
163
|
+
executeTask(candidate) {
|
|
164
|
+
var _a, _b;
|
|
165
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
166
|
+
try {
|
|
167
|
+
let result = yield this._codiacApi.FileStoreDef.tryCreate(candidate);
|
|
168
|
+
if (result.error)
|
|
169
|
+
throw result.error;
|
|
170
|
+
if (!result.success || !result.output)
|
|
171
|
+
throw new Error(`Failed without error writing FileStoreDef record [${candidate.name}]: ${result.message}.`);
|
|
172
|
+
this.logger.notice(`${this._styler.colorGood("SUCCESS!")} Created new fileStoreDef record ${this._styler.bold(this._styler.hilite(candidate.name))}.`, result.output);
|
|
173
|
+
this._ui.userMessage(`${this._styler.colorGood("SUCCESS!")} Created new fileStoreDef record ${this._styler.bold(this._styler.hilite(candidate.name))}.`);
|
|
174
|
+
return;
|
|
175
|
+
}
|
|
176
|
+
catch (err) {
|
|
177
|
+
this.logger.error((_b = (_a = err.message) !== null && _a !== void 0 ? _a : err.stack) !== null && _b !== void 0 ? _b : err, candidate);
|
|
178
|
+
throw err;
|
|
179
|
+
}
|
|
180
|
+
});
|
|
181
|
+
}
|
|
182
|
+
// -------------------------------------------------------------------------------------------------------------------------
|
|
183
|
+
// SUPPORTING METHODS
|
|
184
|
+
// -------------------------------------------------------------------------------------------------------------------------
|
|
185
|
+
// COMMENTED OUT BC: Not in use.
|
|
186
|
+
// /** Throws any encounted exceptions. */
|
|
187
|
+
// private extractResourceGroup(storageAccountResourceId: string): string {
|
|
188
|
+
// // We have to parse the resourceGroup out of the id bc M$ doesnt return it anywhere else. Yeah, dont you just love those guys :|
|
|
189
|
+
// let rg = new RegExp(/\/resourceGroups\/([^\/]+)\//).exec(storageAccountResourceId!)![1];
|
|
190
|
+
// return rg;
|
|
191
|
+
// }
|
|
145
192
|
/** Implements the confirm default or prompt for value pattern. */
|
|
146
193
|
confirmOrPrompt(promptDef, defaultValue, defaultValueDisplay) {
|
|
147
194
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -207,157 +254,26 @@ class FilestoreCapture extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
207
254
|
}
|
|
208
255
|
});
|
|
209
256
|
}
|
|
210
|
-
// /** Facory method for building a FileStoreDef from a fileshare */
|
|
211
|
-
// private buildFileStoreDef(providerSubscriptionId: string, storageAccount: StorageAccount, resourceGroup: string, accountKey: string, fileShareName: string): FileStoreDef {
|
|
212
|
-
// let def: FileStoreDef = {
|
|
213
|
-
// id: undefined,
|
|
214
|
-
// name: fileShareName,
|
|
215
|
-
// providerSubscriptionId: providerSubscriptionId,
|
|
216
|
-
// resourceGroup: resourceGroup,
|
|
217
|
-
// storageAccount: storageAccount.name,
|
|
218
|
-
// shareName: fileShareName,
|
|
219
|
-
// type: FileStoreTypeEnum.AzureFileStorage,
|
|
220
|
-
// instance: {
|
|
221
|
-
// accessKey: accountKey,
|
|
222
|
-
// providerSubscriptionId: providerSubscriptionId,
|
|
223
|
-
// resourceGroup: resourceGroup,
|
|
224
|
-
// resourceId: storageAccount.id!
|
|
225
|
-
// },
|
|
226
|
-
// created: new Date(Date.now()),
|
|
227
|
-
// createdBy: this._userCntx.userName,
|
|
228
|
-
// modified: new Date(Date.now()),
|
|
229
|
-
// modifiedBy: this._userCntx.userName
|
|
230
|
-
// };
|
|
231
|
-
// return def;
|
|
232
|
-
// }
|
|
233
|
-
// /** Retrieves the list of existing filestores available in the given cloud subscription.
|
|
234
|
-
// * Throws any exceptions.
|
|
235
|
-
// *
|
|
236
|
-
// * NOTE: It may be possible that the user has access to browse storage accounts,
|
|
237
|
-
// * but not the list of fileshares, which will yield this message from the fileshare page in the Azure portal:
|
|
238
|
-
// *
|
|
239
|
-
// * ***This machine doesn't seem to have access.***
|
|
240
|
-
// *
|
|
241
|
-
// * *This browser doesn`t seem to be able to reach the necessary data plane APIs that interact with the files in an Azure file share. Interacting with share content is different from managing the Azure file share. Managing the share from this browser could be possible while accessing operations like listing the contents of a file share might not be. This is an issue reported from your side of the network. Check that your machine, from the network it is connected to, is expected to have access. If that is the case, check your networking configuration (proxy configuration, IP rules, Azure network settings for storage, etc) in your organization to ensure Azure services can be fully accessed.*
|
|
242
|
-
// */
|
|
243
|
-
// private async getAllFileStores(providerSubscriptionId: string, storageAccount: StorageAccount, resourceGroup: string, accountKey: string): Promise<FileStoreDef[]> {
|
|
244
|
-
// return new Promise<FileStoreDef[]>(async (resolve, reject) => {
|
|
245
|
-
// let results: FileStoreDef[] = [];
|
|
246
|
-
// try {
|
|
247
|
-
// // Fileshares
|
|
248
|
-
// // see: https://docs.microsoft.com/en-us/rest/api/storagerp/file-shares/list#code-try-0
|
|
249
|
-
// // REST call:
|
|
250
|
-
// // GET https://management.azure.com/subscriptions/0493a4c9-2bc6-4e5a-aee6-57ee4906c3cd/resourceGroups/appdev-fileshare-eastus2-rg/providers/Microsoft.Storage/storageAccounts/appdevfileshare/fileServices/default/shares?api-version=2021-04-01
|
|
251
|
-
// // Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Imwzc1EtNTBjQ0g0eEJWWkxIVEd3blNSNzY4MCIsImtpZCI6Imwzc1EtNTBjQ0g0eEJWWkxIVEd3blNSNzY4MCJ9.eyJhdWQiOiJodHRwczovL21hbmFnZW1lbnQuY29yZS53aW5kb3dzLm5ldC8iLCJpc3MiOiJodHRwczovL3N0cy53aW5kb3dzLm5ldC8zM2VmOWM1NS01YTI4LTQxZmUtOTM0NS00MDE4NzBiZWU4ZWEvIiwiaWF0IjoxNjI5Mzk2NTAyLCJuYmYiOjE2MjkzOTY1MDIsImV4cCI6MTYyOTQwMDQwMiwiYWNyIjoiMSIsImFpbyI6IkUyWmdZRmg5WURjdjI2d2t2VVB2ZzUxdUwrcWUxdFI5c2VQOGdsRGgzTWRzY3NXVEhjSUEiLCJhbXIiOlsicHdkIl0sImFwcGlkIjoiN2Y1OWE3NzMtMmVhZi00MjljLWEwNTktNTBmYzViYjI4YjQ0IiwiYXBwaWRhY3IiOiIyIiwiZmFtaWx5X25hbWUiOiJGcmV5ZGwiLCJnaXZlbl9uYW1lIjoiTWFyayIsImdyb3VwcyI6WyJiZWQ1ZmNmNi03NWRkLTRjMTgtYjY1MS0zOGM3ZmNmMjZmZWIiLCJjYzgxYzViMy0wZGY3LTQ4ZjktYTI4Ny00ZWUzNzdkNGUyNzMiXSwiaXBhZGRyIjoiMTA3Ljc3LjIyMC4xNTAiLCJuYW1lIjoiRnJleWRsLCBNYXJrIiwib2lkIjoiYjAzNDUwMDUtYjU5MC00YjAzLWJmYjctOTY0Njg3YWRjMzljIiwib25wcmVtX3NpZCI6IlMtMS01LTIxLTEwMDQyODg3OTMtMzYwNTg3NzAyMy0yODI0Mzg2OTYyLTEyMzQiLCJwdWlkIjoiMTAwMzIwMDExMjVFMUZDRiIsInJoIjoiMC5BVVlBVlp6dk15aGFfa0dUUlVBWWNMN282bk9uV1gtdkxweENvRmxRX0Z1eWkwUkdBSTQuIiwic2NwIjoidXNlcl9pbXBlcnNvbmF0aW9uIiwic3ViIjoiNDVjTFpJdzJnQ1NHaXh6SE5CMTdHaHFJMV93c05LemRwdnFPYVJOVzhsSSIsInRpZCI6IjMzZWY5YzU1LTVhMjgtNDFmZS05MzQ1LTQwMTg3MGJlZThlYSIsInVuaXF1ZV9uYW1lIjoiTWFyay5GcmV5ZGxAY2hpYW1hc3MuZ292IiwidXBuIjoiTWFyay5GcmV5ZGxAY2hpYW1hc3MuZ292IiwidXRpIjoiN0p2Y2wzSUl2RW1ocmtmMmh4SDBBUSIsInZlciI6IjEuMCIsIndpZHMiOlsiYjc5ZmJmNGQtM2VmOS00Njg5LTgxNDMtNzZiMTk0ZTg1NTA5Il0sInhtc190Y2R0IjoxNTgzOTQ2OTYzfQ.oGZkPU9nAJi3BFDmCHBqYa44FrfQ0P07VczGl5iObYR06KuD45KNCxHqNdWcZPQfdNlohhT7yNUgzAr86qh6UQQRpx6CpZ9x-JjZIDFDjg7-F_OBxO0ZiNGuKhPO0W5W_VQUyWCdITJ1vBaMtzQA9rwwQ3gOLVeyYWe0TxNmvI1PY1AmT6X-qokjLv4hnwzZd5ZxXBrgjfa3rXP6dY9XFqiq6RJEQuxAcQufirDnw72boCsvPFTEcosnYTqGGI3IS4F1wtTdwt27wRiM3KNuMFtNm2_wuEnA5PvKxXOD0ohKektR4K_E-bt1OHAFixZY8te7yaBUbc3i6kaZSf4yaw
|
|
252
|
-
// // let azClient = ShareServiceClient.fromConnectionString(cnxnString);
|
|
253
|
-
// let creds = new StorageSharedKeyCredential(storageAccount.name, accountKey);
|
|
254
|
-
// this.logger.debug(`Shared Account key credential for Storage Account ${storageAccount.name}`, creds);
|
|
255
|
-
// if (!storageAccount.primaryEndpoints.file) {
|
|
256
|
-
// this.logger.debug(`No fileshare endpoint found in storage account [${storageAccount.name}].`);
|
|
257
|
-
// } else {
|
|
258
|
-
// let fileStoresEndpointUrl = storageAccount.primaryEndpoints.file; // https://${storageAccount.name}.file.core.windows.net
|
|
259
|
-
// let shareClient = new ShareServiceClient(fileStoresEndpointUrl, creds);
|
|
260
|
-
// let iterator = await shareClient.listShares();
|
|
261
|
-
// let i = 1;
|
|
262
|
-
// for await (const fileshare of iterator) {
|
|
263
|
-
// console.log(`Share${i}: ${fileshare.name}`);
|
|
264
|
-
// let def = this.buildFileStoreDef(providerSubscriptionId, storageAccount, resourceGroup, accountKey, fileshare.name);
|
|
265
|
-
// results.push(def);
|
|
266
|
-
// i++;
|
|
267
|
-
// }
|
|
268
|
-
// }
|
|
269
|
-
// resolve(results);
|
|
270
|
-
// } catch (err) {
|
|
271
|
-
// reject(err);
|
|
272
|
-
// }
|
|
273
|
-
// });
|
|
274
|
-
// }
|
|
275
|
-
createFileStoreDef(candidate) {
|
|
276
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
277
|
-
return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
278
|
-
var _a, _b;
|
|
279
|
-
try {
|
|
280
|
-
let result = yield this._codiacApi.FileStoreDef.tryCreate(candidate);
|
|
281
|
-
if (result.error)
|
|
282
|
-
throw result.error;
|
|
283
|
-
if (!result.success || !result.output)
|
|
284
|
-
throw new Error(`Failed without error writing FileStoreDef record [${candidate.name}]: ${result.message}.`);
|
|
285
|
-
this.logger.notice(`${this._styler.colorGood("SUCCESS!")} Created new fileStoreDef record ${this._styler.bold(this._styler.hilite(candidate.name))}.`, result.output);
|
|
286
|
-
this._ui.userMessage(`${this._styler.colorGood("SUCCESS!")} Created new fileStoreDef record ${this._styler.bold(this._styler.hilite(candidate.name))}.`);
|
|
287
|
-
resolve();
|
|
288
|
-
}
|
|
289
|
-
catch (err) {
|
|
290
|
-
this.logger.error((_b = (_a = err.message) !== null && _a !== void 0 ? _a : err.stack) !== null && _b !== void 0 ? _b : err, candidate);
|
|
291
|
-
resolve();
|
|
292
|
-
// reject(err);
|
|
293
|
-
}
|
|
294
|
-
}));
|
|
295
|
-
});
|
|
296
|
-
}
|
|
297
|
-
// Migrated to relay
|
|
298
|
-
// /** Returns the list of subscriptions to which the currently logged in user has access. */
|
|
299
|
-
// private getAvailableSubscriptions(): Promise<{ name: string, id: string, user: { name: string } }[]> {
|
|
300
|
-
// return new Promise<{ name: string, id: string, user: { name: string } }[]>(async (resolve, reject) => {
|
|
301
|
-
// let results: { name: string, id: string, user: { name: string } }[] = [];
|
|
302
|
-
// try {
|
|
303
|
-
// // Magic happens here...
|
|
304
|
-
// let cmd = `az account list -o json`;
|
|
305
|
-
// let result = await this.execAsync(cmd);
|
|
306
|
-
// // TODO: provide only subscriptions for the current tenant
|
|
307
|
-
// // let tenantCmd = `az account show --query tenantId -o tsv`;
|
|
308
|
-
// // let cloudTenantId = "33ef9c55-5a28-41fe-9345-401870bee8ea";
|
|
309
|
-
// // let cmdForTenant = `az account list -o json --query "[?tenantId=='${cloudTenantId}'].{ name: name, value: id }"`;
|
|
310
|
-
// if (result.stderr) {
|
|
311
|
-
// this._ui.userMessage(`Error getting available Azure subscriptions: ${result.stderr}`);
|
|
312
|
-
// throw new Error(`Error getting available Azure subscriptions: ${result.stderr}`)
|
|
313
|
-
// } else {
|
|
314
|
-
// let json = result.stdout
|
|
315
|
-
// results = JSON.parse(json);
|
|
316
|
-
// resolve(results);
|
|
317
|
-
// }
|
|
318
|
-
// } catch (err) {
|
|
319
|
-
// reject(err);
|
|
320
|
-
// }
|
|
321
|
-
// });
|
|
322
|
-
// }
|
|
323
|
-
/** Facory method for building a FileStoreDef from a fileshare */
|
|
324
|
-
buildFileStoreDef(providerSubscriptionId, storageAccount, resourceGroup, accountKey, fileShareName) {
|
|
325
|
-
let def = {
|
|
326
|
-
id: undefined,
|
|
327
|
-
name: fileShareName,
|
|
328
|
-
providerSubscriptionId: providerSubscriptionId,
|
|
329
|
-
resourceGroup: resourceGroup,
|
|
330
|
-
storageAccount: storageAccount.name,
|
|
331
|
-
shareName: fileShareName,
|
|
332
|
-
type: contracts_1.FileStoreTypeEnum.AzureFileStorage,
|
|
333
|
-
instance: {
|
|
334
|
-
accessKey: accountKey,
|
|
335
|
-
providerSubscriptionId: providerSubscriptionId,
|
|
336
|
-
resourceGroup: resourceGroup,
|
|
337
|
-
resourceId: storageAccount.id
|
|
338
|
-
},
|
|
339
|
-
created: new Date(Date.now()),
|
|
340
|
-
createdBy: this._userCntx.userName,
|
|
341
|
-
modified: new Date(Date.now()),
|
|
342
|
-
modifiedBy: this._userCntx.userName
|
|
343
|
-
};
|
|
344
|
-
return def;
|
|
345
|
-
}
|
|
346
257
|
}
|
|
347
258
|
exports.default = FilestoreCapture;
|
|
348
259
|
FilestoreCapture.description = 'Creates a reference point in the given enterprise for an existing filestore instance in a cloud provider subscription.';
|
|
349
260
|
FilestoreCapture.aliases = ['fileshare:capture'];
|
|
350
|
-
FilestoreCapture.dependsOn = ["enterprise", "name", "
|
|
261
|
+
FilestoreCapture.dependsOn = ["enterprise", "name", "providerSubscriptionId", "storageAccount", "shareName"];
|
|
351
262
|
FilestoreCapture.flags = {
|
|
352
263
|
help: core_1.Flags.help({ char: 'h' }),
|
|
353
264
|
enterprise: core_1.Flags.string({ char: 'e', required: false, description: 'The name of the enterprise in which to create this filestore. (defaults to the current enterprise context)' }),
|
|
354
265
|
name: core_1.Flags.string({ char: 'n', required: false, description: "The name by which to identify this fileshare definition within the enterprise (Optional: defaults to the shareName)." }),
|
|
266
|
+
provider: core_1.Flags.string({ required: false, options: [contracts_1.CloudProviderEnum.azure], description: 'The cloud provider under which the file storage account resides.' }),
|
|
355
267
|
providerSubscriptionId: core_1.Flags.string({ required: false, description: 'The identifier of the cloud provider subscription under which the file storage account resides.' }),
|
|
356
|
-
resourceGroup: core_1.Flags.string({ required: false, description: 'The name of the Azure resource group under which the instance is to be created (Azure-specific).' }),
|
|
357
268
|
storageAccount: core_1.Flags.string({ required: false, description: 'The name within the cloud provider of the file storage account within which the share resides.' }),
|
|
358
269
|
shareName: core_1.Flags.string({ required: false, description: 'The name of the fileshare to connect to within the file storage account.' }),
|
|
270
|
+
resourceGroup: core_1.Flags.string({ required: false, description: 'The name of the Azure resource group under which the instance is to be created (Azure-specific).' }),
|
|
359
271
|
// resourceId: flags.string({ required: false, description: 'The unique identifier given by the cloud provider to the file storage account.'}),
|
|
360
272
|
// accessKey: flags.string({ required: false, description: 'The key generated upon creation of the FileStore, to enable the consumer to attach to it.'}),
|
|
361
|
-
silent: core_1.Flags.boolean({
|
|
273
|
+
silent: core_1.Flags.boolean({ dependsOn: FilestoreCapture.dependsOn, required: false, exclusive: ["echo", "to-script"], description: 'Non-Interactive mode; executes without any user interaction and fails on any missing or invalid arguments.' }),
|
|
274
|
+
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.' }),
|
|
275
|
+
"to-script": core_1.Flags.boolean({ exclusive: ["echo", "silent"], description: 'Toscript interaction mode; renders the equivalent non-interactive cli command WITHOUT any execution.' }),
|
|
276
|
+
//Not sure what to do with this one yet
|
|
277
|
+
"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)." })
|
|
362
278
|
};
|
|
363
279
|
//# sourceMappingURL=capture.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../../src/commands/filestore/capture.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../../src/commands/filestore/capture.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,9 +33,13 @@ class FileStoreUiLogic {
|
|
|
33
33
|
}
|
|
34
34
|
static displayNameFor(entity, styler, hilite = true) {
|
|
35
35
|
var _a;
|
|
36
|
-
let
|
|
37
|
-
|
|
38
|
-
|
|
36
|
+
let csp = (_a = this.deriveCspFor(entity)) !== null && _a !== void 0 ? _a : "";
|
|
37
|
+
let display = (hilite ? styler.hilite(entity.name) : styler.bold(entity.name)).concat(styler.dim(" (" + this.friendlyNameFor(entity.type) + ")"), " ", csp);
|
|
38
|
+
if (csp == contracts_1.CloudProviderEnum.azure) {
|
|
39
|
+
// if ((<AzureFileStoreDef>entity).storageAccount) {
|
|
40
|
+
if (entity.storageAccount && (entity.storageAccount != entity.name)) {
|
|
41
|
+
display = display.concat(styler.dim(" stgAcct: " + entity.storageAccount));
|
|
42
|
+
}
|
|
39
43
|
}
|
|
40
44
|
if (entity.shareName != entity.name) {
|
|
41
45
|
display = display.concat(styler.dim(" shared as "), entity.shareName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/filestore/list.ts"],"names":[],"mappings":";;;;AACA,sCAAmC;AACnC,6BAA6B;AAC7B,4BAA6B;AAE7B,+
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/filestore/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,8 @@ class KitCreate extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
22
22
|
const { args, flags } = yield this.parse(KitCreate);
|
|
23
23
|
this._userCntx = yield this.establishTenantContext(this._userCntx);
|
|
24
24
|
let rootMap = yield this.getRootMap();
|
|
25
|
-
|
|
25
|
+
const interactionMode = this.getInteractionMode(flags.silent, flags.echo, flags['to-script']);
|
|
26
|
+
let currentEnterprise = (yield this.establishEnterpriseContext(rootMap, flags.enterprise, interactionMode)).enterprise;
|
|
26
27
|
_.remove(rootMap.enterprises, e => e.name != currentEnterprise.name); // trim down to match legacy conditions
|
|
27
28
|
let enterpriseCode = currentEnterprise.name;
|
|
28
29
|
// 1) Get the asset record
|
|
@@ -67,7 +68,7 @@ class KitCreate extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
67
68
|
resolve();
|
|
68
69
|
}
|
|
69
70
|
catch (err) {
|
|
70
|
-
this.
|
|
71
|
+
this.handleError(err);
|
|
71
72
|
// reject(err);
|
|
72
73
|
resolve();
|
|
73
74
|
}
|
|
@@ -130,7 +131,7 @@ class KitCreate extends command_base_enterprise_1.CommandBaseEnterprise {
|
|
|
130
131
|
exports.default = KitCreate;
|
|
131
132
|
KitCreate.description = 'Creates a new kit from an existing asset.';
|
|
132
133
|
KitCreate.aliases = [];
|
|
133
|
-
KitCreate.dependsOn = ["asset", "enterprise", "name", "
|
|
134
|
+
KitCreate.dependsOn = ["asset", "enterprise", "name", "scope"];
|
|
134
135
|
KitCreate.flags = {
|
|
135
136
|
help: core_1.Flags.help({ char: 'h' }),
|
|
136
137
|
asset: core_1.Flags.string({ char: 'a', required: false, description: "The enterprise asset from which to create the kit." }),
|