@pnp/cli-microsoft365 7.0.0-beta.c0afb7b → 7.0.0-beta.c2db9df

package/dist/m365/cli/commands/cli-issue.js

@@ -3,7 +3,7 @@ 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 _CliIssueCommand_instances, _CliIssueCommand_initTelemetry, _CliIssueCommand_initOptions, _CliIssueCommand_initValidators;
+var _CliIssueCommand_instances, _a, _CliIssueCommand_initTelemetry, _CliIssueCommand_initOptions, _CliIssueCommand_initValidators;
 import { browserUtil } from '../../../utils/browserUtil.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
@@ -38,7 +38,7 @@ class CliIssueCommand extends AnonymousCommand {
         await logger.log(issueLink);
     }
 }
-_CliIssueCommand_instances = new WeakSet(), _CliIssueCommand_initTelemetry = function _CliIssueCommand_initTelemetry() {
+_a = CliIssueCommand, _CliIssueCommand_instances = new WeakSet(), _CliIssueCommand_initTelemetry = function _CliIssueCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             type: args.options.type
@@ -47,12 +47,12 @@ _CliIssueCommand_instances = new WeakSet(), _CliIssueCommand_initTelemetry = fun
 }, _CliIssueCommand_initOptions = function _CliIssueCommand_initOptions() {
     this.options.unshift({
         option: '-t, --type <type>',
-        autocomplete: CliIssueCommand.issueType
+        autocomplete: _a.issueType
     });
 }, _CliIssueCommand_initValidators = function _CliIssueCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (CliIssueCommand.issueType.indexOf(args.options.type) < 0) {
-            return `${args.options.type} is not a valid Issue type. Allowed values are ${CliIssueCommand.issueType.join(', ')}`;
+        if (_a.issueType.indexOf(args.options.type) < 0) {
+            return `${args.options.type} is not a valid Issue type. Allowed values are ${_a.issueType.join(', ')}`;
         }
         return true;
     });

package/dist/m365/cli/commands/config/config-get.js

@@ -3,7 +3,7 @@ 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 _CliConfigGetCommand_instances, _CliConfigGetCommand_initTelemetry, _CliConfigGetCommand_initOptions, _CliConfigGetCommand_initValidators;
+var _CliConfigGetCommand_instances, _a, _CliConfigGetCommand_initTelemetry, _CliConfigGetCommand_initOptions, _CliConfigGetCommand_initValidators;
 import { Cli } from "../../../../cli/Cli.js";
 import { settingsNames } from "../../../../settingsNames.js";
 import AnonymousCommand from "../../../base/AnonymousCommand.js";
@@ -26,7 +26,7 @@ class CliConfigGetCommand extends AnonymousCommand {
         await logger.log(Cli.getInstance().config.get(args.options.key));
     }
 }
-_CliConfigGetCommand_instances = new WeakSet(), _CliConfigGetCommand_initTelemetry = function _CliConfigGetCommand_initTelemetry() {
+_a = CliConfigGetCommand, _CliConfigGetCommand_instances = new WeakSet(), _CliConfigGetCommand_initTelemetry = function _CliConfigGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             key: args.options.key
@@ -35,12 +35,12 @@ _CliConfigGetCommand_instances = new WeakSet(), _CliConfigGetCommand_initTelemet
 }, _CliConfigGetCommand_initOptions = function _CliConfigGetCommand_initOptions() {
     this.options.unshift({
         option: '-k, --key <key>',
-        autocomplete: CliConfigGetCommand.optionNames
+        autocomplete: _a.optionNames
     });
 }, _CliConfigGetCommand_initValidators = function _CliConfigGetCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (CliConfigGetCommand.optionNames.indexOf(args.options.key) < 0) {
-            return `${args.options.key} is not a valid setting. Allowed values: ${CliConfigGetCommand.optionNames.join(', ')}`;
+        if (_a.optionNames.indexOf(args.options.key) < 0) {
+            return `${args.options.key} is not a valid setting. Allowed values: ${_a.optionNames.join(', ')}`;
         }
         return true;
     });

package/dist/m365/cli/commands/config/config-reset.js

@@ -3,7 +3,7 @@ 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 _CliConfigResetCommand_instances, _CliConfigResetCommand_initTelemetry, _CliConfigResetCommand_initOptions, _CliConfigResetCommand_initValidators;
+var _CliConfigResetCommand_instances, _a, _CliConfigResetCommand_initTelemetry, _CliConfigResetCommand_initOptions, _CliConfigResetCommand_initValidators;
 import { Cli } from "../../../../cli/Cli.js";
 import { settingsNames } from "../../../../settingsNames.js";
 import AnonymousCommand from "../../../base/AnonymousCommand.js";
@@ -31,7 +31,7 @@ class CliConfigResetCommand extends AnonymousCommand {
         }
     }
 }
-_CliConfigResetCommand_instances = new WeakSet(), _CliConfigResetCommand_initTelemetry = function _CliConfigResetCommand_initTelemetry() {
+_a = CliConfigResetCommand, _CliConfigResetCommand_instances = new WeakSet(), _CliConfigResetCommand_initTelemetry = function _CliConfigResetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             key: args.options.key
@@ -40,13 +40,13 @@ _CliConfigResetCommand_instances = new WeakSet(), _CliConfigResetCommand_initTel
 }, _CliConfigResetCommand_initOptions = function _CliConfigResetCommand_initOptions() {
     this.options.unshift({
         option: '-k, --key [key]',
-        autocomplete: CliConfigResetCommand.optionNames
+        autocomplete: _a.optionNames
     });
 }, _CliConfigResetCommand_initValidators = function _CliConfigResetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.key) {
-            if (CliConfigResetCommand.optionNames.indexOf(args.options.key) < 0) {
-                return `${args.options.key} is not a valid setting. Allowed values: ${CliConfigResetCommand.optionNames.join(', ')}`;
+            if (_a.optionNames.indexOf(args.options.key) < 0) {
+                return `${args.options.key} is not a valid setting. Allowed values: ${_a.optionNames.join(', ')}`;
             }
         }
         return true;

package/dist/m365/cli/commands/config/config-set.js

@@ -3,7 +3,7 @@ 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 _CliConfigSetCommand_instances, _CliConfigSetCommand_initTelemetry, _CliConfigSetCommand_initOptions, _CliConfigSetCommand_initValidators;
+var _CliConfigSetCommand_instances, _a, _CliConfigSetCommand_initTelemetry, _CliConfigSetCommand_initOptions, _CliConfigSetCommand_initValidators;
 import { Cli } from "../../../../cli/Cli.js";
 import { settingsNames } from "../../../../settingsNames.js";
 import AnonymousCommand from "../../../base/AnonymousCommand.js";
@@ -44,21 +44,21 @@ class CliConfigSetCommand extends AnonymousCommand {
         Cli.getInstance().config.set(args.options.key, value);
     }
 }
-_CliConfigSetCommand_instances = new WeakSet(), _CliConfigSetCommand_initTelemetry = function _CliConfigSetCommand_initTelemetry() {
+_a = CliConfigSetCommand, _CliConfigSetCommand_instances = new WeakSet(), _CliConfigSetCommand_initTelemetry = function _CliConfigSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         this.telemetryProperties[args.options.key] = args.options.value;
     });
 }, _CliConfigSetCommand_initOptions = function _CliConfigSetCommand_initOptions() {
     this.options.unshift({
         option: '-k, --key <key>',
-        autocomplete: CliConfigSetCommand.optionNames
+        autocomplete: _a.optionNames
     }, {
         option: '-v, --value <value>'
     });
 }, _CliConfigSetCommand_initValidators = function _CliConfigSetCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (CliConfigSetCommand.optionNames.indexOf(args.options.key) < 0) {
-            return `${args.options.key} is not a valid setting. Allowed values: ${CliConfigSetCommand.optionNames.join(', ')}`;
+        if (_a.optionNames.indexOf(args.options.key) < 0) {
+            return `${args.options.key} is not a valid setting. Allowed values: ${_a.optionNames.join(', ')}`;
         }
         const allowedOutputs = ['text', 'json', 'csv', 'md', 'none'];
         if (args.options.key === settingsNames.output &&

package/dist/m365/commands/login.js

@@ -3,7 +3,7 @@ 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 _LoginCommand_instances, _LoginCommand_initTelemetry, _LoginCommand_initOptions, _LoginCommand_initValidators;
+var _LoginCommand_instances, _a, _LoginCommand_initTelemetry, _LoginCommand_initOptions, _LoginCommand_initValidators;
 import fs from 'fs';
 import auth, { AuthType, CloudType } from '../../Auth.js';
 import Command, { CommandError } from '../../Command.js';
@@ -123,7 +123,7 @@ class LoginCommand extends Command {
         await this.commandAction(logger, args);
     }
 }
-_LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function _LoginCommand_initTelemetry() {
+_a = LoginCommand, _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function _LoginCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             authType: args.options.authType || 'deviceCode',
@@ -133,7 +133,7 @@ _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function
 }, _LoginCommand_initOptions = function _LoginCommand_initOptions() {
     this.options.unshift({
         option: '-t, --authType [authType]',
-        autocomplete: LoginCommand.allowedAuthTypes
+        autocomplete: _a.allowedAuthTypes
     }, {
         option: '-u, --userName [userName]'
     }, {
@@ -178,8 +178,8 @@ _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function
             }
         }
         if (args.options.authType &&
-            LoginCommand.allowedAuthTypes.indexOf(args.options.authType) < 0) {
-            return `'${args.options.authType}' is not a valid authentication type. Allowed authentication types are ${LoginCommand.allowedAuthTypes.join(', ')}`;
+            _a.allowedAuthTypes.indexOf(args.options.authType) < 0) {
+            return `'${args.options.authType}' is not a valid authentication type. Allowed authentication types are ${_a.allowedAuthTypes.join(', ')}`;
         }
         if (args.options.authType === 'secret') {
             if (!args.options.secret) {

package/dist/m365/commands/request.js

@@ -6,10 +6,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _RequestCommand_instances, _RequestCommand_initTelemetry, _RequestCommand_initOptions, _RequestCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
+import auth from '../../Auth.js';
 import Command from '../../Command.js';
 import request from '../../request.js';
 import commands from './commands.js';
-import auth from '../../Auth.js';
 class RequestCommand extends Command {
     get name() {
         return commands.REQUEST;

package/dist/m365/flow/commands/owner/owner-ensure.js

@@ -3,7 +3,7 @@ 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 _FlowOwnerEnsureCommand_instances, _FlowOwnerEnsureCommand_initTelemetry, _FlowOwnerEnsureCommand_initOptions, _FlowOwnerEnsureCommand_initOptionSets, _FlowOwnerEnsureCommand_initValidators;
+var _FlowOwnerEnsureCommand_instances, _a, _FlowOwnerEnsureCommand_initTelemetry, _FlowOwnerEnsureCommand_initOptions, _FlowOwnerEnsureCommand_initOptionSets, _FlowOwnerEnsureCommand_initValidators;
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { aadUser } from '../../../../utils/aadUser.js';
@@ -78,7 +78,7 @@ class FlowOwnerEnsureCommand extends AzmgmtCommand {
         }
     }
 }
-_FlowOwnerEnsureCommand_instances = new WeakSet(), _FlowOwnerEnsureCommand_initTelemetry = function _FlowOwnerEnsureCommand_initTelemetry() {
+_a = FlowOwnerEnsureCommand, _FlowOwnerEnsureCommand_instances = new WeakSet(), _FlowOwnerEnsureCommand_initTelemetry = function _FlowOwnerEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             asAdmin: !!args.options.asAdmin,
@@ -103,7 +103,7 @@ _FlowOwnerEnsureCommand_instances = new WeakSet(), _FlowOwnerEnsureCommand_initT
         option: '--groupName [groupName]'
     }, {
         option: '--roleName <roleName>',
-        autocomplete: FlowOwnerEnsureCommand.allowedRoleNames
+        autocomplete: _a.allowedRoleNames
     }, {
         option: '--asAdmin'
     });
@@ -123,8 +123,8 @@ _FlowOwnerEnsureCommand_instances = new WeakSet(), _FlowOwnerEnsureCommand_initT
         if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID.`;
         }
-        if (FlowOwnerEnsureCommand.allowedRoleNames.indexOf(args.options.roleName) === -1) {
-            return `${args.options.roleName} is not a valid roleName. Valid values are: ${FlowOwnerEnsureCommand.allowedRoleNames.join(', ')}`;
+        if (_a.allowedRoleNames.indexOf(args.options.roleName) === -1) {
+            return `${args.options.roleName} is not a valid roleName. Valid values are: ${_a.allowedRoleNames.join(', ')}`;
         }
         return true;
     });

package/dist/m365/outlook/commands/message/message-list.js

@@ -4,13 +4,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemetry, _OutlookMessageListCommand_initOptions, _OutlookMessageListCommand_initOptionSets;
-import os from 'os';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { Outlook } from '../../Outlook.js';
+import { Cli } from '../../../../cli/Cli.js';
 class OutlookMessageListCommand extends GraphCommand {
     get name() {
         return commands.MESSAGE_LIST;
@@ -61,7 +61,9 @@ class OutlookMessageListCommand extends GraphCommand {
             throw `Folder with name '${args.options.folderName}' not found`;
         }
         if (response.value.length > 1) {
-            throw `Multiple folders with name '${args.options.folderName}' found. Please disambiguate:${os.EOL}${response.value.map(f => `- ${f.id}`).join(os.EOL)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+            const result = await Cli.handleMultipleResultsFound(`Multiple folders with name '${args.options.folderName}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return response.value[0].id;
     }

package/dist/m365/outlook/commands/message/message-move.js

@@ -4,12 +4,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _OutlookMessageMoveCommand_instances, _OutlookMessageMoveCommand_initTelemetry, _OutlookMessageMoveCommand_initOptions, _OutlookMessageMoveCommand_initOptionSets;
-import os from 'os';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { Outlook } from '../../Outlook.js';
+import { Cli } from '../../../../cli/Cli.js';
 class OutlookMessageMoveCommand extends GraphCommand {
     get name() {
         return commands.MESSAGE_MOVE;
@@ -66,7 +66,9 @@ class OutlookMessageMoveCommand extends GraphCommand {
             throw `Folder with name '${folderName}' not found`;
         }
         if (response.value.length > 1) {
-            throw `Multiple folders with name '${folderName}' found. Please disambiguate:${os.EOL}${response.value.map(f => `- ${f.id}`).join(os.EOL)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+            const result = await Cli.handleMultipleResultsFound(`Multiple folders with name '${folderName}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return response.value[0].id;
     }

package/dist/m365/pa/commands/app/app-export.js

@@ -69,7 +69,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
             },
             data: {
                 baseResourceIds: [
-                    `/providers/Microsoft.PowerApps/apps/${args.options.id}`
+                    `/providers/Microsoft.PowerApps/apps/${args.options.name}`
                 ]
             },
             responseType: 'json'
@@ -82,7 +82,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
     }
     async exportPackage(args, logger) {
         if (this.verbose) {
-            await logger.logToStderr(`Initiating package export for Microsoft Power App ${args.options.id}...`);
+            await logger.logToStderr(`Initiating package export for Microsoft Power App ${args.options.name}...`);
         }
         const resources = await this.getPackageResources(args, logger);
         const requestOptions = {
@@ -93,7 +93,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
             responseType: 'json',
             data: {
                 includedResourceIds: [
-                    `/providers/Microsoft.PowerApps/apps/${args.options.id}`
+                    `/providers/Microsoft.PowerApps/apps/${args.options.name}`
                 ],
                 details: {
                     creator: args.options.packageCreatedBy,
@@ -148,11 +148,11 @@ _PaAppExportCommand_instances = new WeakSet(), _PaAppExportCommand_initTelemetry
     });
 }, _PaAppExportCommand_initOptions = function _PaAppExportCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-n, --name <name>'
     }, {
         option: '-e, --environmentName <environmentName>'
     }, {
-        option: '-n, --packageDisplayName [packageDisplayName]'
+        option: '--packageDisplayName [packageDisplayName]'
     }, {
         option: '-d, --packageDescription [packageDescription]'
     }, {
@@ -164,8 +164,8 @@ _PaAppExportCommand_instances = new WeakSet(), _PaAppExportCommand_initTelemetry
     });
 }, _PaAppExportCommand_initValidators = function _PaAppExportCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!validation.isValidGuid(args.options.name)) {
+            return `${args.options.name} is not a valid GUID for option name`;
         }
         if (args.options.path && !fs.existsSync(path.dirname(args.options.path))) {
             return 'Specified path where to save the file does not exist';

package/dist/m365/pa/commands/app/app-owner-set.js

@@ -3,7 +3,7 @@ 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 _PaAppOwnerSetCommand_instances, _PaAppOwnerSetCommand_initTelemetry, _PaAppOwnerSetCommand_initOptions, _PaAppOwnerSetCommand_initValidators, _PaAppOwnerSetCommand_initOptionSets;
+var _PaAppOwnerSetCommand_instances, _a, _PaAppOwnerSetCommand_initTelemetry, _PaAppOwnerSetCommand_initOptions, _PaAppOwnerSetCommand_initValidators, _PaAppOwnerSetCommand_initOptionSets;
 import request from '../../../../request.js';
 import { aadUser } from '../../../../utils/aadUser.js';
 import { validation } from '../../../../utils/validation.js';
@@ -55,7 +55,7 @@ class PaAppOwnerSetCommand extends PowerAppsCommand {
         return aadUser.getUserIdByUpn(options.userName);
     }
 }
-_PaAppOwnerSetCommand_instances = new WeakSet(), _PaAppOwnerSetCommand_initTelemetry = function _PaAppOwnerSetCommand_initTelemetry() {
+_a = PaAppOwnerSetCommand, _PaAppOwnerSetCommand_instances = new WeakSet(), _PaAppOwnerSetCommand_initTelemetry = function _PaAppOwnerSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             userId: typeof args.options.userId !== 'undefined',
@@ -74,7 +74,7 @@ _PaAppOwnerSetCommand_instances = new WeakSet(), _PaAppOwnerSetCommand_initTelem
         option: '--userName [userName]'
     }, {
         option: '--roleForOldAppOwner [roleForOldAppOwner]',
-        autocomplete: PaAppOwnerSetCommand.roleForOldAppOwner
+        autocomplete: _a.roleForOldAppOwner
     });
 }, _PaAppOwnerSetCommand_initValidators = function _PaAppOwnerSetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -87,8 +87,8 @@ _PaAppOwnerSetCommand_instances = new WeakSet(), _PaAppOwnerSetCommand_initTelem
         if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
             return `${args.options.userName} is not a valid UPN for userName`;
         }
-        if (args.options.roleForOldAppOwner && PaAppOwnerSetCommand.roleForOldAppOwner.indexOf(args.options.roleForOldAppOwner) < 0) {
-            return `${args.options.roleForOldAppOwner} is not a valid roleForOldAppOwner. Allowed values are: ${PaAppOwnerSetCommand.roleForOldAppOwner.join(', ')}`;
+        if (args.options.roleForOldAppOwner && _a.roleForOldAppOwner.indexOf(args.options.roleForOldAppOwner) < 0) {
+            return `${args.options.roleForOldAppOwner} is not a valid roleForOldAppOwner. Allowed values are: ${_a.roleForOldAppOwner.join(', ')}`;
         }
         return true;
     });

package/dist/m365/pa/commands/app/app-permission-ensure.js

@@ -3,7 +3,7 @@ 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 _PaAppPermissionEnsureCommand_instances, _PaAppPermissionEnsureCommand_initTelemetry, _PaAppPermissionEnsureCommand_initOptions, _PaAppPermissionEnsureCommand_initValidators, _PaAppPermissionEnsureCommand_initOptionSets, _PaAppPermissionEnsureCommand_initTypes;
+var _PaAppPermissionEnsureCommand_instances, _a, _PaAppPermissionEnsureCommand_initTelemetry, _PaAppPermissionEnsureCommand_initOptions, _PaAppPermissionEnsureCommand_initValidators, _PaAppPermissionEnsureCommand_initOptionSets, _PaAppPermissionEnsureCommand_initTypes;
 import Auth from '../../../../Auth.js';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
@@ -88,7 +88,7 @@ class PaAppPermissionEnsureCommand extends PowerAppsCommand {
         return accessToken.getTenantIdFromAccessToken(Auth.service.accessTokens[Auth.defaultResource].accessToken);
     }
 }
-_PaAppPermissionEnsureCommand_instances = new WeakSet(), _PaAppPermissionEnsureCommand_initTelemetry = function _PaAppPermissionEnsureCommand_initTelemetry() {
+_a = PaAppPermissionEnsureCommand, _PaAppPermissionEnsureCommand_instances = new WeakSet(), _PaAppPermissionEnsureCommand_initTelemetry = function _PaAppPermissionEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             userId: typeof args.options.userId !== 'undefined',
@@ -106,7 +106,7 @@ _PaAppPermissionEnsureCommand_instances = new WeakSet(), _PaAppPermissionEnsureC
         option: '--appName <appName>'
     }, {
         option: '--roleName <roleName>',
-        autocomplete: PaAppPermissionEnsureCommand.roleNames
+        autocomplete: _a.roleNames
     }, {
         option: '--userId [userId]'
     }, {
@@ -138,8 +138,8 @@ _PaAppPermissionEnsureCommand_instances = new WeakSet(), _PaAppPermissionEnsureC
         if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
             return `${args.options.userName} is not a valid user principal name (UPN) for userName.`;
         }
-        if (PaAppPermissionEnsureCommand.roleNames.indexOf(args.options.roleName) < 0) {
-            return `${args.options.roleName} is not a valid roleName. Allowed values are: ${PaAppPermissionEnsureCommand.roleNames.join(', ')}.`;
+        if (_a.roleNames.indexOf(args.options.roleName) < 0) {
+            return `${args.options.roleName} is not a valid roleName. Allowed values are: ${_a.roleNames.join(', ')}.`;
         }
         if (args.options.environmentName && !args.options.asAdmin) {
             return 'Specifying environmentName is only allowed when using asAdmin.';

package/dist/m365/planner/commands/bucket/bucket-get.js

@@ -10,6 +10,8 @@ import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
+import { formatting } from '../../../../utils/formatting.js';
 class PlannerBucketGetCommand extends GraphCommand {
     get name() {
         return commands.BUCKET_GET;
@@ -54,7 +56,9 @@ class PlannerBucketGetCommand extends GraphCommand {
             throw `The specified bucket ${name} does not exist`;
         }
         if (filteredBuckets.length > 1) {
-            throw `Multiple buckets with name ${name} found: ${filteredBuckets.map(x => x.id)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', filteredBuckets);
+            const result = await Cli.handleMultipleResultsFound(`Multiple buckets with name '${name}' found.`, resultAsKeyValuePair);
+            return result.id.toString();
         }
         return filteredBuckets[0].id.toString();
     }

package/dist/m365/planner/commands/bucket/bucket-remove.js

@@ -11,6 +11,7 @@ import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { formatting } from '../../../../utils/formatting.js';
 class PlannerBucketRemoveCommand extends GraphCommand {
     get name() {
         return commands.BUCKET_REMOVE;
@@ -84,7 +85,8 @@ class PlannerBucketRemoveCommand extends GraphCommand {
             throw `The specified bucket ${args.options.name} does not exist`;
         }
         if (filteredBuckets.length > 1) {
-            throw `Multiple buckets with name ${args.options.name} found: ${filteredBuckets.map(x => x.id)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', filteredBuckets);
+            return await Cli.handleMultipleResultsFound(`Multiple buckets with name '${args.options.name}' found.`, resultAsKeyValuePair);
         }
         return filteredBuckets[0];
     }

package/dist/m365/planner/commands/bucket/bucket-set.js

@@ -10,6 +10,8 @@ import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
+import { formatting } from '../../../../utils/formatting.js';
 class PlannerBucketSetCommand extends GraphCommand {
     get name() {
         return commands.BUCKET_SET;
@@ -75,7 +77,8 @@ class PlannerBucketSetCommand extends GraphCommand {
             throw `The specified bucket ${args.options.name} does not exist`;
         }
         if (filteredBuckets.length > 1) {
-            throw `Multiple buckets with name ${args.options.name} found: ${filteredBuckets.map(x => x.id)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', filteredBuckets);
+            return await Cli.handleMultipleResultsFound(`Multiple buckets with name '${args.options.name}' found.`, resultAsKeyValuePair);
         }
         return filteredBuckets[0];
     }

package/dist/m365/planner/commands/task/task-add.js

@@ -141,9 +141,15 @@ class PlannerTaskAddCommand extends GraphCommand {
         if (args.options.planId) {
             return args.options.planId;
         }
-        const groupId = await this.getGroupId(args);
-        const plan = await planner.getPlanByTitle(args.options.planTitle, groupId);
-        return plan.id;
+        if (args.options.rosterId) {
+            const plan = await planner.getPlanByRosterId(args.options.rosterId);
+            return plan.id;
+        }
+        else {
+            const groupId = await this.getGroupId(args);
+            const plan = await planner.getPlanByTitle(args.options.planTitle, groupId);
+            return plan.id;
+        }
     }
     async getGroupId(args) {
         if (args.options.ownerGroupId) {
@@ -187,6 +193,7 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
         Object.assign(this.telemetryProperties, {
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
             bucketId: typeof args.options.bucketId !== 'undefined',
@@ -205,7 +212,7 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
         });
     });
 }, _PlannerTaskAddCommand_initOptions = function _PlannerTaskAddCommand_initOptions() {
-    this.options.unshift({ option: '-t, --title <title>' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--startDateTime [startDateTime]' }, { option: '--dueDateTime [dueDateTime]' }, { option: '--percentComplete [percentComplete]' }, { option: '--assignedToUserIds [assignedToUserIds]' }, { option: '--assignedToUserNames [assignedToUserNames]' }, { option: '--assigneePriority [assigneePriority]' }, { option: '--description [description]' }, {
+    this.options.unshift({ option: '-t, --title <title>' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--rosterId [rosterId]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--startDateTime [startDateTime]' }, { option: '--dueDateTime [dueDateTime]' }, { option: '--percentComplete [percentComplete]' }, { option: '--assignedToUserIds [assignedToUserIds]' }, { option: '--assignedToUserNames [assignedToUserNames]' }, { option: '--assigneePriority [assigneePriority]' }, { option: '--description [description]' }, {
         option: '--appliedCategories [appliedCategories]',
         autocomplete: this.allowedAppliedCategories
     }, {
@@ -214,12 +221,6 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
     }, { option: '--orderHint [orderHint]' }, { option: '--priority [priority]', autocomplete: taskPriority.priorityValues });
 }, _PlannerTaskAddCommand_initValidators = function _PlannerTaskAddCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
-        }
-        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-        }
         if (args.options.ownerGroupId && !validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
@@ -260,7 +261,12 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
         return true;
     });
 }, _PlannerTaskAddCommand_initOptionSets = function _PlannerTaskAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['planId', 'planTitle'] }, { options: ['bucketId', 'bucketName'] });
+    this.optionSets.push({ options: ['planId', 'planTitle', 'rosterId'] }, { options: ['bucketId', 'bucketName'] }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => {
+            return args.options.planTitle !== undefined;
+        }
+    });
 };
 export default new PlannerTaskAddCommand();
 //# sourceMappingURL=task-add.js.map