@pnp/cli-microsoft365 7.0.0-beta.90ef876 → 7.0.0-beta.df9f285

package/dist/m365/pp/commands/chatbot/chatbot-remove.js

@@ -64,7 +64,7 @@ class PpChatbotRemoveCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -78,7 +78,7 @@ class PpChatbotRemoveCommand extends PowerPlatformCommand_1.default {
     deleteChatbot(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const botId = yield this.getChatbotId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/bots(${botId})/Microsoft.Dynamics.CRM.PvaDeleteBot?tag=deprovisionbotondelete`,
@@ -107,7 +107,7 @@ _PpChatbotRemoveCommand_instances = new WeakSet(), _PpChatbotRemoveCommand_initT
     });
 }, _PpChatbotRemoveCommand_initOptions = function _PpChatbotRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/dataverse/dataverse-table-get.js

@@ -41,7 +41,7 @@ class PpDataverseTableGetCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving a table for which the user is an admin...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.0/EntityDefinitions(LogicalName='${args.options.name}')?$select=MetadataId,IsCustomEntity,IsManaged,SchemaName,IconVectorName,LogicalName,EntitySetName,IsActivity,DataProviderId,IsRenameable,IsCustomizable,CanCreateForms,CanCreateViews,CanCreateCharts,CanCreateAttributes,CanChangeTrackingBeEnabled,CanModifyAdditionalSettings,CanChangeHierarchicalRelationship,CanEnableSyncToExternalSearchIndex&api-version=9.1`,
                     headers: {
@@ -66,7 +66,7 @@ _PpDataverseTableGetCommand_instances = new WeakSet(), _PpDataverseTableGetComma
     });
 }, _PpDataverseTableGetCommand_initOptions = function _PpDataverseTableGetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-n, --name <name>'
     }, {

package/dist/m365/pp/commands/dataverse/dataverse-table-list.js

@@ -41,7 +41,7 @@ class PpDataverseTableListCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving list of tables for which the user is an admin...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const endpoint = `${dynamicsApiUrl}/api/data/v9.0/EntityDefinitions?$select=MetadataId,IsCustomEntity,IsManaged,SchemaName,IconVectorName,LogicalName,EntitySetName,IsActivity,DataProviderId,IsRenameable,IsCustomizable,CanCreateForms,CanCreateViews,CanCreateCharts,CanCreateAttributes,CanChangeTrackingBeEnabled,CanModifyAdditionalSettings,CanChangeHierarchicalRelationship,CanEnableSyncToExternalSearchIndex&$filter=(IsIntersect eq false and IsLogicalEntity eq false and%0APrimaryNameAttribute ne null and PrimaryNameAttribute ne %27%27 and ObjectTypeCode gt 0 and%0AObjectTypeCode ne 4712 and ObjectTypeCode ne 4724 and ObjectTypeCode ne 9933 and ObjectTypeCode ne 9934 and%0AObjectTypeCode ne 9935 and ObjectTypeCode ne 9947 and ObjectTypeCode ne 9945 and ObjectTypeCode ne 9944 and%0AObjectTypeCode ne 9942 and ObjectTypeCode ne 9951 and ObjectTypeCode ne 2016 and ObjectTypeCode ne 9949 and%0AObjectTypeCode ne 9866 and ObjectTypeCode ne 9867 and ObjectTypeCode ne 9868) and (IsCustomizable/Value eq true or IsCustomEntity eq true or IsManaged eq false or IsMappable/Value eq true or IsRenameable/Value eq true)&api-version=9.1`;
                 const res = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(res);
@@ -60,7 +60,7 @@ _PpDataverseTableListCommand_instances = new WeakSet(), _PpDataverseTableListCom
     });
 }, _PpDataverseTableListCommand_initOptions = function _PpDataverseTableListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/pp/commands/dataverse/dataverse-table-remove.js

@@ -57,7 +57,7 @@ class PpDataverseTableRemoveCommand extends PowerPlatformCommand_1.default {
     removeDataverseTable(options) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(options.environment, options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(options.environmentName, options.asAdmin);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.0/EntityDefinitions(LogicalName='${options.name}')`,
                     headers: {
@@ -82,7 +82,7 @@ _PpDataverseTableRemoveCommand_instances = new WeakSet(), _PpDataverseTableRemov
     });
 }, _PpDataverseTableRemoveCommand_initOptions = function _PpDataverseTableRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-n, --name <name>'
     }, {

package/dist/m365/pp/commands/dataverse/dataverse-table-row-list.js

@@ -40,7 +40,7 @@ class PpDataverseTableRowListCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr('Retrieving list of table rows');
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const entitySetName = yield this.getEntitySetName(dynamicsApiUrl, args);
                 if (this.verbose) {
                     logger.logToStderr('Entity set name is: ' + entitySetName);
@@ -80,7 +80,7 @@ _PpDataverseTableRowListCommand_instances = new WeakSet(), _PpDataverseTableRowL
     });
 }, _PpDataverseTableRowListCommand_initOptions = function _PpDataverseTableRowListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--entitySetName [entitySetName]'
     }, {

package/dist/m365/pp/commands/dataverse/dataverse-table-row-remove.js

@@ -60,7 +60,7 @@ class PpDataverseTableRowRemoveCommand extends PowerPlatformCommand_1.default {
     deleteTableRow(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const entitySetName = yield this.getEntitySetName(dynamicsApiUrl, args);
                 if (this.verbose) {
                     logger.logToStderr('Entity set name is: ' + entitySetName);
@@ -107,7 +107,7 @@ _PpDataverseTableRowRemoveCommand_instances = new WeakSet(), _PpDataverseTableRo
     });
 }, _PpDataverseTableRowRemoveCommand_initOptions = function _PpDataverseTableRowRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id <id>'
     }, {

package/dist/m365/pp/commands/solution/solution-get.js

@@ -45,7 +45,7 @@ class PpSolutionGetCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving a specific solution '${args.options.id || args.options.name}'...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const res = yield this.getSolution(dynamicsApiUrl, args.options);
                 if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(res);
@@ -96,7 +96,7 @@ _PpSolutionGetCommand_instances = new WeakSet(), _PpSolutionGetCommand_initTelem
     });
 }, _PpSolutionGetCommand_initOptions = function _PpSolutionGetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/solution/solution-list.js

@@ -42,7 +42,7 @@ class PpSolutionListCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving list of solutions for which the user is an admin...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const requestUrl = `${dynamicsApiUrl}/api/data/v9.0/solutions?$filter=isvisible eq true&$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
                 const res = yield odata_1.odata.getAllItems(requestUrl);
                 if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
@@ -73,7 +73,7 @@ _PpSolutionListCommand_instances = new WeakSet(), _PpSolutionListCommand_initTel
     });
 }, _PpSolutionListCommand_initOptions = function _PpSolutionListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/pp/commands/solution/solution-publish.js

@@ -41,7 +41,7 @@ class PpSolutionPublishCommand extends PowerPlatformCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const solutionId = yield this.getSolutionId(args, logger);
                 const solutionComponents = yield this.getSolutionComponents(dynamicsApiUrl, solutionId, logger);
                 const parameterXml = this.buildXmlRequestObject(solutionComponents, logger);
@@ -95,7 +95,7 @@ class PpSolutionPublishCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving solutionId`);
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -132,7 +132,7 @@ _PpSolutionPublishCommand_instances = new WeakSet(), _PpSolutionPublishCommand_i
     });
 }, _PpSolutionPublishCommand_initOptions = function _PpSolutionPublishCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/solution/solution-publisher-add.js

@@ -39,7 +39,7 @@ class PpSolutionPublisherAddCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Adding new publisher '${args.options.name}'...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.0/publishers`,
                     headers: {
@@ -69,7 +69,7 @@ _PpSolutionPublisherAddCommand_instances = new WeakSet(), _PpSolutionPublisherAd
     });
 }, _PpSolutionPublisherAddCommand_initOptions = function _PpSolutionPublisherAddCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-n, --name <name>'
     }, {

package/dist/m365/pp/commands/solution/solution-publisher-get.js

@@ -56,7 +56,7 @@ class PpSolutionPublisherGetCommand extends PowerPlatformCommand_1.default {
                 responseType: 'json'
             };
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 if (args.options.id) {
                     requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/publishers(${args.options.id})?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix&api-version=9.1`;
                     const result = yield request_1.default.get(requestOptions);
@@ -85,7 +85,7 @@ _PpSolutionPublisherGetCommand_instances = new WeakSet(), _PpSolutionPublisherGe
     });
 }, _PpSolutionPublisherGetCommand_initOptions = function _PpSolutionPublisherGetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/solution/solution-publisher-list.js

@@ -41,7 +41,7 @@ class PpSolutionPublisherListCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving list of publishers...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.0/publishers?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix${!args.options.includeMicrosoftPublishers ? `&$filter=publisherid ne 'd21aab70-79e7-11dd-8874-00188b01e34f'` : ''}&api-version=9.1`,
                     headers: {
@@ -67,7 +67,7 @@ _PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherL
     });
 }, _PpSolutionPublisherListCommand_initOptions = function _PpSolutionPublisherListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--includeMicrosoftPublishers'
     }, {

package/dist/m365/pp/commands/solution/solution-publisher-remove.js

@@ -64,7 +64,7 @@ class PpSolutionPublisherRemoveCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -78,7 +78,7 @@ class PpSolutionPublisherRemoveCommand extends PowerPlatformCommand_1.default {
     deletePublisher(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const publisherId = yield this.getPublisherId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/publishers(${publisherId})`,
@@ -106,7 +106,7 @@ _PpSolutionPublisherRemoveCommand_instances = new WeakSet(), _PpSolutionPublishe
     });
 }, _PpSolutionPublisherRemoveCommand_initOptions = function _PpSolutionPublisherRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/solution/solution-remove.js

@@ -64,7 +64,7 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -78,7 +78,7 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand_1.default {
     deleteSolution(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const solutionId = yield this.getSolutionId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/solutions(${solutionId})`,
@@ -106,7 +106,7 @@ _PpSolutionRemoveCommand_instances = new WeakSet(), _PpSolutionRemoveCommand_ini
     });
 }, _PpSolutionRemoveCommand_initOptions = function _PpSolutionRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/purview/commands/retentionevent/retentionevent-remove.js

@@ -36,23 +36,8 @@ class PurviewRetentionEventRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeRetentionEvent = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/security/triggers/retentionEvents/${args.options.id}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.force) {
-                yield removeRetentionEvent();
+                yield this.removeRetentionEvent(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -62,11 +47,28 @@ class PurviewRetentionEventRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the retention event ${args.options.id}?`
                 });
                 if (result.continue) {
-                    yield removeRetentionEvent();
+                    yield this.removeRetentionEvent(args.options);
                 }
             }
         });
     }
+    removeRetentionEvent(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/beta/security/triggers/retentionEvents/${options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _PurviewRetentionEventRemoveCommand_instances = new WeakSet(), _PurviewRetentionEventRemoveCommand_initTelemetry = function _PurviewRetentionEventRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/purview/commands/retentioneventtype/retentioneventtype-remove.js

@@ -36,23 +36,8 @@ class PurviewRetentionEventTypeRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeRetentionEventType = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/security/triggerTypes/retentionEventTypes/${args.options.id}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.force) {
-                yield removeRetentionEventType();
+                yield this.removeRetentionEventType(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -62,11 +47,28 @@ class PurviewRetentionEventTypeRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the retention event type with id ${args.options.id}?`
                 });
                 if (result.continue) {
-                    yield removeRetentionEventType();
+                    yield this.removeRetentionEventType(args.options);
                 }
             }
         });
     }
+    removeRetentionEventType(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/security/triggerTypes/retentionEventTypes/${options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _PurviewRetentionEventTypeRemoveCommand_instances = new WeakSet(), _PurviewRetentionEventTypeRemoveCommand_initTelemetry = function _PurviewRetentionEventTypeRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/search/commands/externalconnection/externalconnection-remove.js

@@ -35,48 +35,31 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initOptionSets).call(this);
     }
     getExternalConnectionId(args) {
-        if (args.options.id) {
-            return Promise.resolve(args.options.id);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/external/connections?$filter=name eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'&$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                return args.options.id;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/external/connections?$filter=name eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'&$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
             if (res.value.length === 1) {
-                return Promise.resolve(res.value[0].id);
+                return res.value[0].id;
             }
             if (res.value.length === 0) {
-                return Promise.reject(`The specified connection does not exist in Microsoft Search`);
+                throw `The specified connection does not exist in Microsoft Search`;
             }
-            return Promise.reject(`Multiple external connections with name ${args.options.name} found. Please disambiguate (IDs): ${res.value.map(x => x.id).join(', ')}`);
+            throw `Multiple external connections with name ${args.options.name} found. Please disambiguate (IDs): ${res.value.map(x => x.id).join(', ')}`;
         });
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeExternalConnection = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const externalConnectionId = yield this.getExternalConnectionId(args);
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/external/connections/${formatting_1.formatting.encodeQueryParameter(externalConnectionId)}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.force) {
-                yield removeExternalConnection();
+                yield this.removeExternalConnection(args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -86,11 +69,29 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the external connection '${args.options.id || args.options.name}'?`
                 });
                 if (result.continue) {
-                    yield removeExternalConnection();
+                    yield this.removeExternalConnection(args);
                 }
             }
         });
     }
+    removeExternalConnection(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const externalConnectionId = yield this.getExternalConnectionId(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/external/connections/${formatting_1.formatting.encodeQueryParameter(externalConnectionId)}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SearchExternalConnectionRemoveCommand_instances = new WeakSet(), _SearchExternalConnectionRemoveCommand_initTelemetry = function _SearchExternalConnectionRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {