@pnp/cli-microsoft365 7.8.0-beta.5f64790 → 7.8.0

package/dist/cli/cli.js

@@ -748,13 +748,10 @@ async function closeWithError(error, args, showHelpIfEnabled = false) {
         exitCode = error.code;
     }
     await cli.error(errorMessage);
-    if (showHelpIfEnabled &&
-        cli.getSettingWithDefaultValue(settingsNames.showHelpOnFailure, showHelpIfEnabled)) {
-        await printHelp(await getHelpMode(args.options), exitCode);
-    }
-    else {
-        process.exit(exitCode);
+    if (showHelpIfEnabled && cli.getSettingWithDefaultValue(settingsNames.showHelpOnFailure, showHelpIfEnabled)) {
+        await cli.error(`Run 'm365 ${cli.commandToExecute.name} -h' for help.`);
     }
+    process.exit(exitCode);
     // will never be run. Required for testing where we're stubbing process.exit
     /* c8 ignore next */
     throw new Error(errorMessage);

package/dist/m365/entra/commands/app/app-permission-add.js

@@ -10,6 +10,8 @@ import commands from "../../commands.js";
 import request from "../../../../request.js";
 import { validation } from "../../../../utils/validation.js";
 import aadCommands from "../../aadCommands.js";
+import { formatting } from "../../../../utils/formatting.js";
+import { cli } from "../../../../cli/cli.js";
 var ScopeType;
 (function (ScopeType) {
     ScopeType["Role"] = "Role";
@@ -68,11 +70,27 @@ class EntraAppPermissionAddCommand extends GraphCommand {
         }
     }
     async getAppObject(options) {
-        const apps = options.appObjectId
-            ? await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=id eq '${options.appObjectId}'&$select=id,appId,requiredResourceAccess`)
-            : await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=appId eq '${options.appId}'&$select=id,appId,requiredResourceAccess`);
+        let appNotFoundMessage = '';
+        let apps = [];
+        if (options.appId) {
+            apps = await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=appId eq '${options.appId}'&$select=id,appId,requiredResourceAccess`);
+            appNotFoundMessage = `client id ${options.appId}`;
+        }
+        else if (options.appName) {
+            apps = await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=displayName eq '${formatting.encodeQueryParameter(options.appName)}'&$select=id,appId,requiredResourceAccess`);
+            appNotFoundMessage = `name ${options.appName}`;
+            if (apps.length > 1) {
+                const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', apps);
+                const result = await cli.handleMultipleResultsFound(`Multiple Entra application registrations with name '${options.appName}' found.`, resultAsKeyValuePair);
+                return result;
+            }
+        }
+        else if (options.appObjectId) {
+            apps = await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=id eq '${options.appObjectId}'&$select=id,appId,requiredResourceAccess`);
+            appNotFoundMessage = `object id ${options.appObjectId}`;
+        }
         if (apps.length === 0) {
-            throw `App with ${options.appObjectId ? 'object id' : 'client id'} ${options.appObjectId ? options.appObjectId : options.appId} not found in Microsoft Entra ID`;
+            throw `App with ${appNotFoundMessage} not found in Microsoft Entra ID`;
         }
         return apps[0];
     }
@@ -209,6 +227,7 @@ _EntraAppPermissionAddCommand_instances = new WeakSet(), _EntraAppPermissionAddC
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
+            appName: typeof args.options.appName !== 'undefined',
             appObjectId: typeof args.options.appObjectId !== 'undefined',
             applicationPermissions: typeof args.options.applicationPermissions !== 'undefined',
             delegatedPermissions: typeof args.options.delegatedPermissions !== 'undefined',
@@ -216,7 +235,7 @@ _EntraAppPermissionAddCommand_instances = new WeakSet(), _EntraAppPermissionAddC
         });
     });
 }, _EntraAppPermissionAddCommand_initOptions = function _EntraAppPermissionAddCommand_initOptions() {
-    this.options.unshift({ option: '-i, --appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '-a, --applicationPermissions [applicationPermissions]' }, { option: '-d, --delegatedPermissions [delegatedPermissions]' }, { option: '--grantAdminConsent' });
+    this.options.unshift({ option: '-i, --appId [appId]' }, { option: '-n, --appName [appName]' }, { option: '--appObjectId [appObjectId]' }, { option: '-a, --applicationPermissions [applicationPermissions]' }, { option: '-d, --delegatedPermissions [delegatedPermissions]' }, { option: '--grantAdminConsent' });
 }, _EntraAppPermissionAddCommand_initValidators = function _EntraAppPermissionAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
@@ -228,7 +247,7 @@ _EntraAppPermissionAddCommand_instances = new WeakSet(), _EntraAppPermissionAddC
         return true;
     });
 }, _EntraAppPermissionAddCommand_initOptionSets = function _EntraAppPermissionAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appObjectId'] });
+    this.optionSets.push({ options: ['appId', 'appName', 'appObjectId'] });
     this.optionSets.push({
         options: ['applicationPermissions', 'delegatedPermissions'],
         runsWhen: (args) => args.options.delegatedPermissions === undefined && args.options.applicationPermissions === undefined

package/dist/m365/entra/commands/app/app-permission-list.js

@@ -9,6 +9,7 @@ import commands from "../../commands.js";
 import request from "../../../../request.js";
 import { validation } from "../../../../utils/validation.js";
 import { formatting } from "../../../../utils/formatting.js";
+import { cli } from "../../../../cli/cli.js";
 class EntraAppPermissionListCommand extends GraphCommand {
     get name() {
         return commands.APP_PERMISSION_LIST;
@@ -40,18 +41,28 @@ class EntraAppPermissionListCommand extends GraphCommand {
         if (options.appObjectId) {
             return options.appObjectId;
         }
+        const { appId, appName } = options;
+        const filter = appId ?
+            `appId eq '${formatting.encodeQueryParameter(appId)}'` :
+            `displayName eq '${formatting.encodeQueryParameter(appName)}'`;
         const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications?$filter=appId eq '${formatting.encodeQueryParameter(options.appId)}'&$select=id`,
+            url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
         const res = await request.get(requestOptions);
+        if (res.value.length === 1) {
+            return res.value[0].id;
+        }
         if (res.value.length === 0) {
-            throw `No Microsoft Entra application registration with ID ${options.appId} found`;
+            const applicationIdentifier = appId ? `ID ${appId}` : `name ${appName}`;
+            throw `No Microsoft Entra application registration with ${applicationIdentifier} found`;
         }
-        return res.value[0].id;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
+        const result = await cli.handleMultipleResultsFound(`Multiple Entra application registrations with name '${appName}' found.`, resultAsKeyValuePair);
+        return result.id;
     }
     async getAppRegPermissions(appObjectId, permissionType, logger) {
         const requestOptions = {
@@ -156,12 +167,13 @@ _EntraAppPermissionListCommand_instances = new WeakSet(), _EntraAppPermissionLis
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
+            appName: typeof args.options.appName !== 'undefined',
             appObjectId: typeof args.options.appObjectId !== 'undefined',
             type: typeof args.options.type !== 'undefined'
         });
     });
 }, _EntraAppPermissionListCommand_initOptions = function _EntraAppPermissionListCommand_initOptions() {
-    this.options.unshift({ option: '-i, --appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--type [type]', autocomplete: this.allowedTypes });
+    this.options.unshift({ option: '-i, --appId [appId]' }, { option: '-n, --appName [appName]' }, { option: '--appObjectId [appObjectId]' }, { option: '--type [type]', autocomplete: this.allowedTypes });
 }, _EntraAppPermissionListCommand_initValidators = function _EntraAppPermissionListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
@@ -176,7 +188,7 @@ _EntraAppPermissionListCommand_instances = new WeakSet(), _EntraAppPermissionLis
         return true;
     });
 }, _EntraAppPermissionListCommand_initOptionSets = function _EntraAppPermissionListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appObjectId'] });
+    this.optionSets.push({ options: ['appId', 'appName', 'appObjectId'] });
 };
 export default new EntraAppPermissionListCommand();
 //# sourceMappingURL=app-permission-list.js.map

package/dist/m365/entra/commands/group/group-add.js

@@ -169,29 +169,27 @@ _EntraGroupAddCommand_instances = new WeakSet(), _EntraGroupAddCommand_initOptio
             }
         }
         if (args.options.ownerIds) {
-            const ids = args.options.ownerIds.split(',').map(i => i.trim());
-            if (!validation.isValidGuidArray(ids)) {
-                const invalidGuid = ids.find(id => !validation.isValidGuid(id));
-                return `'${invalidGuid}' is not a valid GUID for option 'ownerIds'.`;
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ownerIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'ownerIds': ${isValidGUIDArrayResult}.`;
             }
         }
         if (args.options.ownerUserNames) {
-            const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(args.options.ownerUserNames.split(',').map(u => u.trim()));
-            if (isValidUserPrincipalNameArray !== true) {
-                return `User principal name '${isValidUserPrincipalNameArray}' is invalid for option 'ownerUserNames'.`;
+            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.ownerUserNames);
+            if (isValidUPNArrayResult !== true) {
+                return `The following user principal names are invalid for the option 'ownerUserNames': ${isValidUPNArrayResult}.`;
             }
         }
         if (args.options.memberIds) {
-            const ids = args.options.memberIds.split(',').map(i => i.trim());
-            if (!validation.isValidGuidArray(ids)) {
-                const invalidGuid = ids.find(id => !validation.isValidGuid(id));
-                return `'${invalidGuid}' is not a valid GUID for option 'memberIds'.`;
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.memberIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'memberIds': ${isValidGUIDArrayResult}.`;
             }
         }
         if (args.options.memberUserNames) {
-            const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(args.options.memberUserNames.split(',').map(u => u.trim()));
-            if (isValidUserPrincipalNameArray !== true) {
-                return `User principal name '${isValidUserPrincipalNameArray}' is invalid for option 'memberUserNames'.`;
+            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.memberUserNames);
+            if (isValidUPNArrayResult !== true) {
+                return `The following user principal names are invalid for the option 'memberUserNames': ${isValidUPNArrayResult}.`;
             }
         }
         if (['microsoft365', 'security'].indexOf(args.options.type) === -1) {

package/dist/m365/entra/commands/group/group-user-add.js

@@ -119,16 +119,15 @@ _EntraGroupUserAddCommand_instances = new WeakSet(), _EntraGroupUserAddCommand_i
             return `${args.options.groupId} is not a valid GUID for option groupId.`;
         }
         if (args.options.ids) {
-            const ids = args.options.ids.split(',').map(i => i.trim());
-            if (!validation.isValidGuidArray(ids)) {
-                const invalidGuid = ids.find(id => !validation.isValidGuid(id));
-                return `'${invalidGuid}' is not a valid GUID for option 'ids'.`;
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ids);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'ids': ${isValidGUIDArrayResult}.`;
             }
         }
         if (args.options.userNames) {
-            const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(args.options.userNames.split(',').map(u => u.trim()));
-            if (isValidUserPrincipalNameArray !== true) {
-                return `User principal name '${isValidUserPrincipalNameArray}' is invalid for option 'userNames'.`;
+            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.userNames);
+            if (isValidUPNArrayResult !== true) {
+                return `The following user principal names are invalid for the option 'userNames': ${isValidUPNArrayResult}.`;
             }
         }
         if (this.roleValues.indexOf(args.options.role) === -1) {

package/dist/m365/entra/commands/user/user-registrationdetails-list.js

@@ -205,16 +205,15 @@ _EntraUserRegistrationDetailsListCommand_instances = new WeakSet(), _EntraUserRe
             }
         }
         if (args.options.userIds) {
-            const ids = args.options.userIds.split(',').map(i => i.trim());
-            if (!validation.isValidGuidArray(ids)) {
-                const invalidGuid = ids.find(id => !validation.isValidGuid(id));
-                return `'${invalidGuid}' is not a valid GUID for option 'userIds'.`;
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.userIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'userIds': ${isValidGUIDArrayResult}.`;
             }
         }
         if (args.options.userPrincipalNames) {
-            const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(args.options.userPrincipalNames.split(',').map(u => u.trim()));
-            if (isValidUserPrincipalNameArray !== true) {
-                return `User principal name '${isValidUserPrincipalNameArray}' is invalid for option 'userPrincipalNames'.`;
+            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.userPrincipalNames);
+            if (isValidUPNArrayResult !== true) {
+                return `The following user principal names are invalid for the option 'userPrincipalNames': ${isValidUPNArrayResult}.`;
             }
         }
         return true;

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

@@ -35,7 +35,7 @@ class PlannerBucketAddCommand extends GraphCommand {
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/buckets`,
                 headers: {
-                    'accept': 'application/json;odata.metadata=none'
+                    accept: 'application/json;odata.metadata=none'
                 },
                 responseType: 'json',
                 data: {
@@ -57,18 +57,15 @@ class PlannerBucketAddCommand extends GraphCommand {
         }
         if (args.options.planTitle) {
             const groupId = await this.getGroupId(args);
-            const plan = await planner.getPlanByTitle(args.options.planTitle, groupId);
-            return plan.id;
+            return planner.getPlanIdByTitle(args.options.planTitle, groupId);
         }
-        const plan = await planner.getPlanByRosterId(args.options.rosterId);
-        return plan.id;
+        return planner.getPlanIdByRosterId(args.options.rosterId);
     }
     async getGroupId(args) {
         if (args.options.ownerGroupId) {
             return args.options.ownerGroupId;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName);
-        return group.id;
+        return entraGroup.getGroupIdByDisplayName(args.options.ownerGroupName);
     }
 }
 _PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_initTelemetry = function _PlannerBucketAddCommand_initTelemetry() {

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

@@ -10,8 +10,6 @@ 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;
@@ -30,38 +28,20 @@ class PlannerBucketGetCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            const bucketId = await this.getBucketId(args);
-            const bucket = await this.getBucketById(bucketId);
+            const bucket = await this.getBucket(args);
             await logger.log(bucket);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getBucketId(args) {
+    async getBucket(args) {
         const { id, name } = args.options;
         if (id) {
-            return id;
+            return this.getBucketById(id);
         }
         const planId = await this.getPlanId(args);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        const buckets = await request.get(requestOptions);
-        const filteredBuckets = buckets.value.filter(b => name.toLowerCase() === b.name.toLowerCase());
-        if (!filteredBuckets.length) {
-            throw `The specified bucket ${name} does not exist`;
-        }
-        if (filteredBuckets.length > 1) {
-            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();
+        return planner.getBucketByTitle(name, planId);
     }
     async getPlanId(args) {
         const { planId, planTitle, rosterId } = args.options;
@@ -70,11 +50,9 @@ class PlannerBucketGetCommand extends GraphCommand {
         }
         if (planTitle) {
             const groupId = await this.getGroupId(args);
-            const plan = await planner.getPlanByTitle(planTitle, groupId);
-            return plan.id;
+            return planner.getPlanIdByTitle(planTitle, groupId);
         }
-        const plan = await planner.getPlanByRosterId(rosterId);
-        return plan.id;
+        return planner.getPlanIdByRosterId(rosterId);
     }
     async getBucketById(id) {
         const requestOptions = {
@@ -91,8 +69,7 @@ class PlannerBucketGetCommand extends GraphCommand {
         if (ownerGroupId) {
             return ownerGroupId;
         }
-        const group = await entraGroup.getGroupByDisplayName(ownerGroupName);
-        return group.id;
+        return entraGroup.getGroupIdByDisplayName(ownerGroupName);
     }
 }
 _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_initTelemetry = function _PlannerBucketGetCommand_initTelemetry() {

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

@@ -45,18 +45,15 @@ class PlannerBucketListCommand extends GraphCommand {
         }
         if (args.options.planTitle) {
             const groupId = await this.getGroupId(args);
-            const plan = await planner.getPlanByTitle(args.options.planTitle, groupId);
-            return plan.id;
+            return planner.getPlanIdByTitle(args.options.planTitle, groupId);
         }
-        const plan = await planner.getPlanByRosterId(args.options.rosterId);
-        return plan.id;
+        return planner.getPlanIdByRosterId(args.options.rosterId);
     }
     async getGroupId(args) {
         if (args.options.ownerGroupId) {
             return args.options.ownerGroupId;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName);
-        return group.id;
+        return entraGroup.getGroupIdByDisplayName(args.options.ownerGroupName);
     }
 }
 _PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_initTelemetry = function _PlannerBucketListCommand_initTelemetry() {

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

@@ -11,7 +11,6 @@ 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;
@@ -30,6 +29,9 @@ class PlannerBucketRemoveCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         const removeBucket = async () => {
+            if (this.verbose) {
+                await logger.logToStderr(`Removing bucket...`);
+            }
             try {
                 const bucket = await this.getBucket(args);
                 const requestOptions = {
@@ -61,30 +63,14 @@ class PlannerBucketRemoveCommand extends GraphCommand {
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/buckets/${args.options.id}`,
                 headers: {
-                    accept: 'application/json'
+                    accept: 'application/json;odata.metadata=minimal'
                 },
                 responseType: 'json'
             };
             return await request.get(requestOptions);
         }
         const planId = await this.getPlanId(args);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        const buckets = await request.get(requestOptions);
-        const filteredBuckets = buckets.value.filter(b => args.options.name.toLowerCase() === b.name.toLowerCase());
-        if (!filteredBuckets.length) {
-            throw `The specified bucket ${args.options.name} does not exist`;
-        }
-        if (filteredBuckets.length > 1) {
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', filteredBuckets);
-            return await cli.handleMultipleResultsFound(`Multiple buckets with name '${args.options.name}' found.`, resultAsKeyValuePair);
-        }
-        return filteredBuckets[0];
+        return planner.getBucketByTitle(args.options.name, planId, 'minimal');
     }
     async getPlanId(args) {
         const { planId, planTitle, rosterId } = args.options;
@@ -93,19 +79,16 @@ class PlannerBucketRemoveCommand extends GraphCommand {
         }
         if (planTitle) {
             const groupId = await this.getGroupId(args);
-            const plan = await planner.getPlanByTitle(planTitle, groupId);
-            return plan.id;
+            return planner.getPlanIdByTitle(planTitle, groupId);
         }
-        const plan = await planner.getPlanByRosterId(rosterId);
-        return plan.id;
+        return planner.getPlanIdByRosterId(rosterId);
     }
     async getGroupId(args) {
         const { ownerGroupId, ownerGroupName } = args.options;
         if (ownerGroupId) {
             return ownerGroupId;
         }
-        const group = await entraGroup.getGroupByDisplayName(ownerGroupName);
-        return group.id;
+        return entraGroup.getGroupIdByDisplayName(ownerGroupName);
     }
 }
 _PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveCommand_initTelemetry = function _PlannerBucketRemoveCommand_initTelemetry() {

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

@@ -10,8 +10,6 @@ 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;
@@ -29,6 +27,9 @@ class PlannerBucketSetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _PlannerBucketSetCommand_instances, "m", _PlannerBucketSetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr(`Updating bucket...`);
+        }
         try {
             const bucket = await this.getBucket(args);
             const requestOptions = {
@@ -38,15 +39,11 @@ class PlannerBucketSetCommand extends GraphCommand {
                     'if-match': bucket['@odata.etag']
                 },
                 responseType: 'json',
-                data: {}
+                data: {
+                    name: args.options.newName,
+                    orderHint: args.options.orderHint
+                }
             };
-            const { newName, orderHint } = args.options;
-            if (newName) {
-                requestOptions.data.name = newName;
-            }
-            if (orderHint) {
-                requestOptions.data.orderHint = orderHint;
-            }
             await request.patch(requestOptions);
         }
         catch (err) {
@@ -58,30 +55,14 @@ class PlannerBucketSetCommand extends GraphCommand {
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/buckets/${args.options.id}`,
                 headers: {
-                    accept: 'application/json'
+                    accept: 'application/json;odata.metadata=minimal'
                 },
                 responseType: 'json'
             };
             return await request.get(requestOptions);
         }
         const planId = await this.getPlanId(args);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        const buckets = await request.get(requestOptions);
-        const filteredBuckets = buckets.value.filter(b => args.options.name.toLowerCase() === b.name.toLowerCase());
-        if (!filteredBuckets.length) {
-            throw `The specified bucket ${args.options.name} does not exist`;
-        }
-        if (filteredBuckets.length > 1) {
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', filteredBuckets);
-            return await cli.handleMultipleResultsFound(`Multiple buckets with name '${args.options.name}' found.`, resultAsKeyValuePair);
-        }
-        return filteredBuckets[0];
+        return planner.getBucketByTitle(args.options.name, planId, 'minimal');
     }
     async getPlanId(args) {
         const { planId, planTitle, rosterId } = args.options;
@@ -90,19 +71,16 @@ class PlannerBucketSetCommand extends GraphCommand {
         }
         if (planTitle) {
             const groupId = await this.getGroupId(args);
-            const plan = await planner.getPlanByTitle(planTitle, groupId);
-            return plan.id;
+            return planner.getPlanIdByTitle(planTitle, groupId);
         }
-        const plan = await planner.getPlanByRosterId(rosterId);
-        return plan.id;
+        return planner.getPlanIdByRosterId(rosterId);
     }
     async getGroupId(args) {
         const { ownerGroupId, ownerGroupName } = args.options;
         if (ownerGroupId) {
             return ownerGroupId;
         }
-        const group = await entraGroup.getGroupByDisplayName(ownerGroupName);
-        return group.id;
+        return entraGroup.getGroupIdByDisplayName(ownerGroupName);
     }
 }
 _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_initTelemetry = function _PlannerBucketSetCommand_initTelemetry() {

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

@@ -37,12 +37,14 @@ class PlannerPlanAddCommand extends GraphCommand {
             };
             if (args.options.rosterId) {
                 data.container = {
-                    "url": `https://graph.microsoft.com/v1.0/planner/rosters/${args.options.rosterId}`
+                    url: `https://graph.microsoft.com/v1.0/planner/rosters/${args.options.rosterId}`
                 };
             }
             else {
                 const groupId = await this.getGroupId(args);
-                data.owner = groupId;
+                data.container = {
+                    url: `https://graph.microsoft.com/v1.0/groups/${groupId}`
+                };
             }
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/plans`,
@@ -57,7 +59,7 @@ class PlannerPlanAddCommand extends GraphCommand {
             await logger.log(result);
         }
         catch (err) {
-            if (err.error && err.error.error.message === "You do not have the required permissions to access this item, or the item may not exist.") {
+            if (args.options.rosterId && err.error?.error.message === "You do not have the required permissions to access this item, or the item may not exist.") {
                 throw new CommandError("You can only add 1 plan to a Roster");
             }
             this.handleRejectedODataJsonPromise(err);
@@ -134,8 +136,7 @@ class PlannerPlanAddCommand extends GraphCommand {
         if (args.options.ownerGroupId) {
             return args.options.ownerGroupId;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName);
-        return group.id;
+        return entraGroup.getGroupIdByDisplayName(args.options.ownerGroupName);
     }
 }
 _PlannerPlanAddCommand_instances = new WeakSet(), _PlannerPlanAddCommand_initTelemetry = function _PlannerPlanAddCommand_initTelemetry() {
@@ -169,8 +170,17 @@ _PlannerPlanAddCommand_instances = new WeakSet(), _PlannerPlanAddCommand_initTel
         if (args.options.shareWithUserIds && args.options.shareWithUserNames) {
             return 'Specify either shareWithUserIds or shareWithUserNames but not both';
         }
-        if (args.options.shareWithUserIds && !validation.isValidGuidArray(args.options.shareWithUserIds.split(','))) {
-            return 'shareWithUserIds contains invalid GUID';
+        if (args.options.shareWithUserIds) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.shareWithUserIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'shareWithUserIds': ${isValidGUIDArrayResult}.`;
+            }
+        }
+        if (args.options.shareWithUserNames) {
+            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.shareWithUserNames);
+            if (isValidUPNArrayResult !== true) {
+                return `The following user principal names are invalid for the option 'shareWithUserNames': ${isValidUPNArrayResult}.`;
+            }
         }
         return true;
     });