@pnp/cli-microsoft365 7.2.0-beta.54705a9 → 7.2.0-beta.6775e3a

package/dist/m365/aad/commands/m365group/m365group-recyclebinitem-clear.js

@@ -35,13 +35,8 @@ class AadM365GroupRecycleBinItemClearCommand extends GraphCommand {
             await clearM365GroupRecycleBinItems();
         }
         else {
-            const response = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to clear all M365 Groups from recycle bin ?`
-            });
-            if (response.continue) {
+            const response = await Cli.promptForConfirmation({ message: `Are you sure you want to clear all M365 Groups from recycle bin?` });
+            if (response) {
                 await clearM365GroupRecycleBinItems();
             }
         }

package/dist/m365/aad/commands/m365group/m365group-recyclebinitem-remove.js

@@ -46,13 +46,8 @@ class AadM365GroupRecycleBinItemRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the group '${args.options.id || args.options.displayName || args.options.mailNickname}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group '${args.options.id || args.options.displayName || args.options.mailNickname}'?` });
+            if (result) {
                 await removeGroup();
             }
         }

package/dist/m365/aad/commands/m365group/m365group-remove.js

@@ -56,13 +56,8 @@ class AadM365GroupRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the group ${args.options.id}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group ${args.options.id}?` });
+            if (result) {
                 await removeGroup();
             }
         }

package/dist/m365/aad/commands/m365group/m365group-user-remove.js

@@ -92,13 +92,8 @@ class AadM365GroupUserRemoveCommand extends GraphCommand {
             await removeUser();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove ${args.options.userName} from the ${(typeof args.options.groupId !== 'undefined' ? 'group' : 'team')} ${groupId}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove ${args.options.userName} from the ${(typeof args.options.groupId !== 'undefined' ? 'group' : 'team')} ${groupId}?` });
+            if (result) {
                 await removeUser();
             }
         }

package/dist/m365/aad/commands/oauth2grant/oauth2grant-remove.js

@@ -44,13 +44,8 @@ class AadOAuth2GrantRemoveCommand extends GraphCommand {
             await removeOauth2Grant();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the OAuth2 permissions for ${args.options.grantId}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the OAuth2 permissions for ${args.options.grantId}?` });
+            if (result) {
                 await removeOauth2Grant();
             }
         }

package/dist/m365/aad/commands/siteclassification/siteclassification-disable.js

@@ -63,13 +63,8 @@ class AadSiteClassificationDisableCommand extends GraphCommand {
             await disableSiteClassification();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to disable site classification?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to disable site classification?` });
+            if (result) {
                 await disableSiteClassification();
             }
         }

package/dist/m365/aad/commands/user/user-license-remove.js

@@ -32,13 +32,8 @@ class AadUserLicenseRemoveCommand extends GraphCommand {
             await this.deleteUserLicenses(args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the licenses for the user '${args.options.userId || args.options.userName}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the licenses for the user '${args.options.userId || args.options.userName}'?` });
+            if (result) {
                 await this.deleteUserLicenses(args);
             }
         }

package/dist/m365/aad/commands/user/user-recyclebinitem-clear.js

@@ -63,13 +63,8 @@ class AadUserRecycleBinItemClearCommand extends GraphCommand {
             await clearRecycleBinUsers();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: 'Are you sure you want to permanently delete all deleted users?'
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: 'Are you sure you want to permanently delete all deleted users?' });
+            if (result) {
                 await clearRecycleBinUsers();
             }
         }

package/dist/m365/aad/commands/user/user-recyclebinitem-remove.js

@@ -43,13 +43,8 @@ class AadUserRecycleBinItemRemoveCommand extends GraphCommand {
             await clearRecycleBinItem();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to permanently delete the user with id ${args.options.id}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to permanently delete the user with id ${args.options.id}?` });
+            if (result) {
                 await clearRecycleBinItem();
             }
         }

package/dist/m365/aad/commands/user/user-remove.js

@@ -32,13 +32,8 @@ class AadUserRemoveCommand extends GraphCommand {
             await this.deleteUser(args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove user '${args.options.id || args.options.userName}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove user '${args.options.id || args.options.userName}'?` });
+            if (result) {
                 await this.deleteUser(args);
             }
         }

package/dist/m365/aad/commands.js

@@ -1,5 +1,9 @@
 const prefix = 'aad';
 export default {
+    ADMINISTRATIVEUNIT_ADD: `${prefix} administrativeunit add`,
+    ADMINISTRATIVEUNIT_GET: `${prefix} administrativeunit get`,
+    ADMINISTRATIVEUNIT_LIST: `${prefix} administrativeunit list`,
+    ADMINISTRATIVEUNIT_REMOVE: `${prefix} administrativeunit remove`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
     APP_LIST: `${prefix} app list`,

package/dist/m365/base/AppCommand.js

@@ -8,6 +8,7 @@ import fs from 'fs';
 import { Cli } from '../../cli/Cli.js';
 import Command, { CommandError } from '../../Command.js';
 import { validation } from '../../utils/validation.js';
+import { formatting } from '../../utils/formatting.js';
 class AppCommand extends Command {
     get resource() {
         return 'https://graph.microsoft.com';
@@ -52,18 +53,8 @@ class AppCommand extends Command {
             return super.action(logger, args);
         }
         if (this.m365rcJson.apps.length > 1) {
-            const result = await Cli.prompt({
-                message: `Multiple Azure AD apps found in ${m365rcJsonPath}. Which app would you like to use?`,
-                type: 'list',
-                choices: this.m365rcJson.apps.map((app, i) => {
-                    return {
-                        name: `${app.name} (${app.appId})`,
-                        value: i
-                    };
-                }),
-                default: 0,
-                name: 'appIdIndex'
-            });
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('appIdIndex', this.m365rcJson.apps);
+            const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD apps found in ${m365rcJsonPath}.`, resultAsKeyValuePair);
             this.appId = this.m365rcJson.apps[result.appIdIndex].appId;
             await super.action(logger, args);
         }

package/dist/m365/commands/setup.js

@@ -12,7 +12,6 @@ import { pid } from '../../utils/pid.js';
 import AnonymousCommand from '../base/AnonymousCommand.js';
 import commands from './commands.js';
 import { interactivePreset, powerShellPreset, scriptingPreset } from './setupPresets.js';
-import { prompt } from '../../utils/prompt.js';
 class SetupCommand extends AnonymousCommand {
     get name() {
         return commands.SETUP;
@@ -23,8 +22,6 @@ class SetupCommand extends AnonymousCommand {
     constructor() {
         super();
         _SetupCommand_instances.add(this);
-        // used for injecting answers from tests
-        this.answers = {};
         __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initValidators).call(this);
@@ -51,43 +48,40 @@ class SetupCommand extends AnonymousCommand {
         await logger.logToStderr(`This command will guide you through the process of configuring the CLI for your needs.`);
         await logger.logToStderr(`Please, answer the following questions and we'll define a set of settings to best match how you intend to use the CLI.`);
         await logger.logToStderr('');
-        const preferences = await prompt.forInput([
-            {
-                type: 'list',
-                name: 'usageMode',
-                message: 'How do you plan to use the CLI?',
-                choices: [
-                    'Interactively',
-                    'Scripting'
-                ]
-            },
-            {
-                type: 'confirm',
-                name: 'usedInPowerShell',
+        const preferences = {};
+        const usageModeConfig = {
+            message: 'How do you plan to use the CLI?',
+            choices: [
+                { name: 'Interactively', value: 'Interactively' },
+                { name: 'Scripting', value: 'Scripting' }
+            ]
+        };
+        preferences.usageMode = await Cli.promptForSelection(usageModeConfig);
+        if (preferences.usageMode === 'Scripting') {
+            const usedInPowerShellConfig = {
                 message: 'Are you going to use the CLI in PowerShell?',
-                when: (answers) => answers.usageMode === 'Scripting',
                 default: pid.isPowerShell()
-            },
-            {
-                type: 'list',
-                name: 'experience',
-                message: 'How experienced are you in using the CLI?',
-                choices: [
-                    'Beginner',
-                    'Proficient'
-                ]
-            },
-            {
-                type: 'confirm',
-                name: 'summary',
-                // invoked by inquirer
-                /* c8 ignore next 4 */
-                message: (answers) => {
-                    settings = this.getSettings(answers);
-                    return this.getSummaryMessage(settings);
-                }
+            };
+            preferences.usedInPowerShell = await Cli.promptForConfirmation(usedInPowerShellConfig);
+        }
+        const experienceConfig = {
+            message: 'How experienced are you in using the CLI?',
+            choices: [
+                { name: 'Beginner', value: 'Beginner' },
+                { name: 'Proficient', value: 'Proficient' }
+            ]
+        };
+        preferences.experience = await Cli.promptForSelection(experienceConfig);
+        const summaryConfig = {
+            // invoked by inquirer
+            /* c8 ignore next 6 */
+            message: async () => {
+                settings = this.getSettings(preferences);
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                return this.getSummaryMessage(settings);
             }
-        ], this.answers);
+        };
+        preferences.summary = await Cli.promptForConfirmation(summaryConfig);
         if (preferences.summary) {
             // used only for testing. Normally, we'd get the settings from the answers
             /* c8 ignore next 3 */

package/dist/m365/context/commands/context-remove.js

@@ -27,13 +27,8 @@ class ContextRemoveCommand extends AnonymousCommand {
             await this.removeContext();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the context?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the context?` });
+            if (result) {
                 await this.removeContext();
             }
         }

package/dist/m365/context/commands/option/option-remove.js

@@ -30,13 +30,8 @@ class ContextOptionRemoveCommand extends ContextCommand {
             await this.removeContextOption(args.options.name, logger);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the context option ${args.options.name}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the context option ${args.options.name}?` });
+            if (result) {
                 await this.removeContextOption(args.options.name, logger);
             }
         }

package/dist/m365/{search/commands/externalconnection/externalconnection-add.js → external/commands/connection/connection-add.js}

@@ -3,23 +3,26 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SearchExternalConnectionAddCommand_instances, _SearchExternalConnectionAddCommand_initTelemetry, _SearchExternalConnectionAddCommand_initOptions, _SearchExternalConnectionAddCommand_initValidators;
+var _ExternalConnectionAddCommand_instances, _ExternalConnectionAddCommand_initTelemetry, _ExternalConnectionAddCommand_initOptions, _ExternalConnectionAddCommand_initValidators;
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class SearchExternalConnectionAddCommand extends GraphCommand {
+class ExternalConnectionAddCommand extends GraphCommand {
     get name() {
-        return commands.EXTERNALCONNECTION_ADD;
+        return commands.CONNECTION_ADD;
     }
     get description() {
-        return 'Adds a new External Connection for Microsoft Search';
+        return 'Adds a new external connection';
+    }
+    alias() {
+        return [commands.EXTERNALCONNECTION_ADD];
     }
     constructor() {
         super();
-        _SearchExternalConnectionAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionAddCommand_instances, "m", _SearchExternalConnectionAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionAddCommand_instances, "m", _SearchExternalConnectionAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionAddCommand_instances, "m", _SearchExternalConnectionAddCommand_initValidators).call(this);
+        _ExternalConnectionAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _ExternalConnectionAddCommand_instances, "m", _ExternalConnectionAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _ExternalConnectionAddCommand_instances, "m", _ExternalConnectionAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _ExternalConnectionAddCommand_instances, "m", _ExternalConnectionAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         let appIds = [];
@@ -51,13 +54,13 @@ class SearchExternalConnectionAddCommand extends GraphCommand {
         }
     }
 }
-_SearchExternalConnectionAddCommand_instances = new WeakSet(), _SearchExternalConnectionAddCommand_initTelemetry = function _SearchExternalConnectionAddCommand_initTelemetry() {
+_ExternalConnectionAddCommand_instances = new WeakSet(), _ExternalConnectionAddCommand_initTelemetry = function _ExternalConnectionAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             authorizedAppIds: typeof args.options.authorizedAppIds !== 'undefined'
         });
     });
-}, _SearchExternalConnectionAddCommand_initOptions = function _SearchExternalConnectionAddCommand_initOptions() {
+}, _ExternalConnectionAddCommand_initOptions = function _ExternalConnectionAddCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
@@ -67,7 +70,7 @@ _SearchExternalConnectionAddCommand_instances = new WeakSet(), _SearchExternalCo
     }, {
         option: '--authorizedAppIds [authorizedAppIds]'
     });
-}, _SearchExternalConnectionAddCommand_initValidators = function _SearchExternalConnectionAddCommand_initValidators() {
+}, _ExternalConnectionAddCommand_initValidators = function _ExternalConnectionAddCommand_initValidators() {
     this.validators.push(async (args) => {
         const id = args.options.id;
         if (id.length < 3 || id.length > 32) {
@@ -104,5 +107,5 @@ _SearchExternalConnectionAddCommand_instances = new WeakSet(), _SearchExternalCo
         return true;
     });
 };
-export default new SearchExternalConnectionAddCommand();
-//# sourceMappingURL=externalconnection-add.js.map
+export default new ExternalConnectionAddCommand();
+//# sourceMappingURL=connection-add.js.map

package/dist/m365/{search/commands/externalconnection/externalconnection-get.js → external/commands/connection/connection-get.js}

@@ -3,24 +3,27 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SearchExternalConnectionGetCommand_instances, _SearchExternalConnectionGetCommand_initTelemetry, _SearchExternalConnectionGetCommand_initOptions, _SearchExternalConnectionGetCommand_initOptionSets;
+var _ExternalConnectionGetCommand_instances, _ExternalConnectionGetCommand_initTelemetry, _ExternalConnectionGetCommand_initOptions, _ExternalConnectionGetCommand_initOptionSets;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class SearchExternalConnectionGetCommand extends GraphCommand {
+class ExternalConnectionGetCommand extends GraphCommand {
     get name() {
-        return commands.EXTERNALCONNECTION_GET;
+        return commands.CONNECTION_GET;
     }
     get description() {
-        return 'Get a specific external connection for use in Microsoft Search';
+        return 'Get a specific external connection';
+    }
+    alias() {
+        return [commands.EXTERNALCONNECTION_GET];
     }
     constructor() {
         super();
-        _SearchExternalConnectionGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionGetCommand_instances, "m", _SearchExternalConnectionGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionGetCommand_instances, "m", _SearchExternalConnectionGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionGetCommand_instances, "m", _SearchExternalConnectionGetCommand_initOptionSets).call(this);
+        _ExternalConnectionGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _ExternalConnectionGetCommand_instances, "m", _ExternalConnectionGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _ExternalConnectionGetCommand_instances, "m", _ExternalConnectionGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _ExternalConnectionGetCommand_instances, "m", _ExternalConnectionGetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         let url = `${this.resource}/v1.0/external/connections`;
@@ -52,21 +55,21 @@ class SearchExternalConnectionGetCommand extends GraphCommand {
         }
     }
 }
-_SearchExternalConnectionGetCommand_instances = new WeakSet(), _SearchExternalConnectionGetCommand_initTelemetry = function _SearchExternalConnectionGetCommand_initTelemetry() {
+_ExternalConnectionGetCommand_instances = new WeakSet(), _ExternalConnectionGetCommand_initTelemetry = function _ExternalConnectionGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined'
         });
     });
-}, _SearchExternalConnectionGetCommand_initOptions = function _SearchExternalConnectionGetCommand_initOptions() {
+}, _ExternalConnectionGetCommand_initOptions = function _ExternalConnectionGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
     }, {
         option: '-n, --name [name]'
     });
-}, _SearchExternalConnectionGetCommand_initOptionSets = function _SearchExternalConnectionGetCommand_initOptionSets() {
+}, _ExternalConnectionGetCommand_initOptionSets = function _ExternalConnectionGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'name'] });
 };
-export default new SearchExternalConnectionGetCommand();
-//# sourceMappingURL=externalconnection-get.js.map
+export default new ExternalConnectionGetCommand();
+//# sourceMappingURL=connection-get.js.map

package/dist/m365/{search/commands/externalconnection/externalconnection-list.js → external/commands/connection/connection-list.js}

@@ -1,13 +1,16 @@
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class SearchExternalConnectionListCommand extends GraphCommand {
+class ExternalConnectionListCommand extends GraphCommand {
     get name() {
-        return commands.EXTERNALCONNECTION_LIST;
+        return commands.CONNECTION_LIST;
     }
     get description() {
         return 'Lists external connections defined in the Microsoft Search';
     }
+    alias() {
+        return [commands.EXTERNALCONNECTION_LIST];
+    }
     defaultProperties() {
         return ['id', 'name', 'state'];
     }
@@ -21,5 +24,5 @@ class SearchExternalConnectionListCommand extends GraphCommand {
         }
     }
 }
-export default new SearchExternalConnectionListCommand();
-//# sourceMappingURL=externalconnection-list.js.map
+export default new ExternalConnectionListCommand();
+//# sourceMappingURL=connection-list.js.map

package/dist/m365/{search/commands/externalconnection/externalconnection-remove.js → external/commands/connection/connection-remove.js}

@@ -3,25 +3,28 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SearchExternalConnectionRemoveCommand_instances, _SearchExternalConnectionRemoveCommand_initTelemetry, _SearchExternalConnectionRemoveCommand_initOptions, _SearchExternalConnectionRemoveCommand_initOptionSets;
+var _ExternalConnectionRemoveCommand_instances, _ExternalConnectionRemoveCommand_initTelemetry, _ExternalConnectionRemoveCommand_initOptions, _ExternalConnectionRemoveCommand_initOptionSets;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class SearchExternalConnectionRemoveCommand extends GraphCommand {
+class ExternalConnectionRemoveCommand extends GraphCommand {
     get name() {
-        return commands.EXTERNALCONNECTION_REMOVE;
+        return commands.CONNECTION_REMOVE;
     }
     get description() {
-        return 'Removes a specific External Connection from Microsoft Search';
+        return 'Removes a specific external connection';
+    }
+    alias() {
+        return [commands.EXTERNALCONNECTION_REMOVE];
     }
     constructor() {
         super();
-        _SearchExternalConnectionRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initOptionSets).call(this);
+        _ExternalConnectionRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _ExternalConnectionRemoveCommand_instances, "m", _ExternalConnectionRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _ExternalConnectionRemoveCommand_instances, "m", _ExternalConnectionRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _ExternalConnectionRemoveCommand_instances, "m", _ExternalConnectionRemoveCommand_initOptionSets).call(this);
     }
     async getExternalConnectionId(args) {
         if (args.options.id) {
@@ -39,7 +42,7 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand {
             return res.value[0].id;
         }
         if (res.value.length === 0) {
-            throw `The specified connection does not exist in Microsoft Search`;
+            throw `The specified connection does not exist`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
         const result = await Cli.handleMultipleResultsFound(`Multiple external connections with name ${args.options.name} found.`, resultAsKeyValuePair);
@@ -50,13 +53,8 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand {
             await this.removeExternalConnection(args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the external connection '${args.options.id || args.options.name}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the external connection '${args.options.id || args.options.name}'?` });
+            if (result) {
                 await this.removeExternalConnection(args);
             }
         }
@@ -78,7 +76,7 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand {
         }
     }
 }
-_SearchExternalConnectionRemoveCommand_instances = new WeakSet(), _SearchExternalConnectionRemoveCommand_initTelemetry = function _SearchExternalConnectionRemoveCommand_initTelemetry() {
+_ExternalConnectionRemoveCommand_instances = new WeakSet(), _ExternalConnectionRemoveCommand_initTelemetry = function _ExternalConnectionRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
@@ -86,10 +84,10 @@ _SearchExternalConnectionRemoveCommand_instances = new WeakSet(), _SearchExterna
             force: (!(!args.options.force)).toString()
         });
     });
-}, _SearchExternalConnectionRemoveCommand_initOptions = function _SearchExternalConnectionRemoveCommand_initOptions() {
+}, _ExternalConnectionRemoveCommand_initOptions = function _ExternalConnectionRemoveCommand_initOptions() {
     this.options.unshift({ option: '--id [id]' }, { option: '--name [name]' }, { option: '-f, --force' });
-}, _SearchExternalConnectionRemoveCommand_initOptionSets = function _SearchExternalConnectionRemoveCommand_initOptionSets() {
+}, _ExternalConnectionRemoveCommand_initOptionSets = function _ExternalConnectionRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'name'] });
 };
-export default new SearchExternalConnectionRemoveCommand();
-//# sourceMappingURL=externalconnection-remove.js.map
+export default new ExternalConnectionRemoveCommand();
+//# sourceMappingURL=connection-remove.js.map