@pnp/cli-microsoft365 7.4.0-beta.fce7b64 → 7.5.0-beta.0ae7da4

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

@@ -5,8 +5,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 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';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
@@ -36,13 +36,13 @@ class FlowOwnerEnsureCommand extends PowerAutomateCommand {
                 id = args.options.userId;
             }
             else if (args.options.userName) {
-                id = await aadUser.getUserIdByUpn(args.options.userName);
+                id = await entraUser.getUserIdByUpn(args.options.userName);
             }
             else if (args.options.groupId) {
                 id = args.options.groupId;
             }
             else {
-                id = await aadGroup.getGroupIdByDisplayName(args.options.groupName);
+                id = await entraGroup.getGroupIdByDisplayName(args.options.groupName);
             }
             let type;
             if (args.options.userId || args.options.userName) {

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

@@ -6,8 +6,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowOwnerRemoveCommand_instances, _FlowOwnerRemoveCommand_initTelemetry, _FlowOwnerRemoveCommand_initOptions, _FlowOwnerRemoveCommand_initValidators, _FlowOwnerRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
@@ -38,13 +38,13 @@ class FlowOwnerRemoveCommand extends PowerAutomateCommand {
                     idToRemove = args.options.userId;
                 }
                 else if (args.options.userName) {
-                    idToRemove = await aadUser.getUserIdByUpn(args.options.userName);
+                    idToRemove = await entraUser.getUserIdByUpn(args.options.userName);
                 }
                 else if (args.options.groupId) {
                     idToRemove = args.options.groupId;
                 }
                 else {
-                    idToRemove = await aadGroup.getGroupIdByDisplayName(args.options.groupName);
+                    idToRemove = await entraGroup.getGroupIdByDisplayName(args.options.groupName);
                 }
                 const requestOptions = {
                     url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,

package/dist/m365/flow/commands/run/run-get.js

@@ -30,8 +30,12 @@ class FlowRunGetCommand extends PowerAutomateCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving information about run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
         }
+        if (args.options.includeTriggerInformation) {
+            await this.warn(logger, `Parameter 'includeTriggerInformation' is deprecated. Please use 'withTrigger instead`);
+        }
+        const actionsParameter = args.options.withActions ? '$expand=properties%2Factions&' : '';
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?${actionsParameter}api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },
@@ -43,17 +47,11 @@ class FlowRunGetCommand extends PowerAutomateCommand {
             res.endTime = res.properties.endTime || '';
             res.status = res.properties.status;
             res.triggerName = res.properties.trigger.name;
-            if (args.options.includeTriggerInformation && res.properties.trigger.outputsLink) {
-                const triggerInformationOptions = {
-                    url: res.properties.trigger.outputsLink.uri,
-                    headers: {
-                        accept: 'application/json',
-                        'x-anonymous': true
-                    },
-                    responseType: 'json'
-                };
-                const triggerInformationResponse = await request.get(triggerInformationOptions);
-                res.triggerInformation = triggerInformationResponse.body;
+            if ((args.options.includeTriggerInformation || args.options.withTrigger) && res.properties.trigger.outputsLink) {
+                res.triggerInformation = await this.getTriggerInformation(res);
+            }
+            if (!!args.options.withActions) {
+                res.actions = await this.getActionsInformation(res, args.options.withActions);
             }
             await logger.log(res);
         }
@@ -61,6 +59,38 @@ class FlowRunGetCommand extends PowerAutomateCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async getTriggerInformation(res) {
+        return await this.requestAdditionalInformation(res.properties.trigger.outputsLink.uri);
+    }
+    async getActionsInformation(res, withActions) {
+        const chosenActions = typeof withActions === 'string' ? withActions.split(',') : null;
+        const actionsResult = {};
+        for (const action in res.properties.actions) {
+            if (!res.properties.actions[action] || (chosenActions && chosenActions.indexOf(action) === -1)) {
+                continue;
+            }
+            actionsResult[action] = res.properties.actions[action];
+            if (!!res.properties.actions[action].inputsLink?.uri) {
+                actionsResult[action].input = await this.requestAdditionalInformation(res.properties.actions[action].inputsLink?.uri);
+            }
+            if (!!res.properties.actions[action].outputsLink?.uri) {
+                actionsResult[action].output = await this.requestAdditionalInformation(res.properties.actions[action].outputsLink?.uri);
+            }
+        }
+        return actionsResult;
+    }
+    async requestAdditionalInformation(requestUri) {
+        const additionalInformationOptions = {
+            url: requestUri,
+            headers: {
+                accept: 'application/json',
+                'x-anonymous': true
+            },
+            responseType: 'json'
+        };
+        const additionalInformationResponse = await request.get(additionalInformationOptions);
+        return additionalInformationResponse.body ? additionalInformationResponse.body : additionalInformationResponse;
+    }
 }
 _FlowRunGetCommand_instances = new WeakSet(), _FlowRunGetCommand_initOptions = function _FlowRunGetCommand_initOptions() {
     this.options.unshift({
@@ -71,18 +101,27 @@ _FlowRunGetCommand_instances = new WeakSet(), _FlowRunGetCommand_initOptions = f
         option: '-e, --environmentName <environmentName>'
     }, {
         option: '--includeTriggerInformation'
+    }, {
+        option: '--withTrigger'
+    }, {
+        option: '--withActions [withActions]'
     });
 }, _FlowRunGetCommand_initValidators = function _FlowRunGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.flowName)) {
             return `${args.options.flowName} is not a valid GUID`;
         }
+        if (args.options.withActions && (typeof args.options.withActions !== 'string' && typeof args.options.withActions !== 'boolean')) {
+            return 'the withActions parameter must be a string or boolean';
+        }
         return true;
     });
 }, _FlowRunGetCommand_initTelemetry = function _FlowRunGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            includeTriggerInformation: !!args.options.includeTriggerInformation
+            includeTriggerInformation: !!args.options.includeTriggerInformation,
+            withTrigger: !!args.options.withTrigger,
+            withActions: typeof args.options.withActions !== 'undefined'
         });
     });
 };

package/dist/m365/onenote/commands/notebook/notebook-list.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators, _OneNoteNotebookListCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -54,7 +54,7 @@ class OneNoteNotebookListCommand extends GraphCommand {
         return endpoint;
     }
     async getGroupId(groupName) {
-        const group = await aadGroup.getGroupByDisplayName(groupName);
+        const group = await entraGroup.getGroupByDisplayName(groupName);
         return group.id;
     }
     async getSpoSiteId(webUrl) {

package/dist/m365/onenote/commands/page/page-list.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _OneNotePageListCommand_instances, _OneNotePageListCommand_initTelemetry, _OneNotePageListCommand_initOptions, _OneNotePageListCommand_initValidators, _OneNotePageListCommand_initOptionSets;
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -54,7 +54,7 @@ class OneNotePageListCommand extends GraphCommand {
         return endpoint;
     }
     async getGroupId(groupName) {
-        const group = await aadGroup.getGroupByDisplayName(groupName);
+        const group = await entraGroup.getGroupByDisplayName(groupName);
         return group.id;
     }
     async commandAction(logger, args) {

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

@@ -32,8 +32,13 @@ class PaAppGetCommand extends PowerAppsCommand {
     async commandAction(logger, args) {
         try {
             if (args.options.name) {
+                let endpoint = `${this.resource}/providers/Microsoft.PowerApps`;
+                if (args.options.asAdmin) {
+                    endpoint += `/scopes/admin/environments/${formatting.encodeQueryParameter(args.options.environmentName)}`;
+                }
+                endpoint += `/apps/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`;
                 const requestOptions = {
-                    url: `${this.resource}/providers/Microsoft.PowerApps/apps/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+                    url: endpoint,
                     headers: {
                         accept: 'application/json'
                     },
@@ -50,8 +55,8 @@ class PaAppGetCommand extends PowerAppsCommand {
                     await logger.logToStderr(`Retrieving information about Microsoft Power App with displayName '${args.options.displayName}'...`);
                 }
                 const getAppsOutput = await this.getApps(args, logger);
-                const allApps = JSON.parse(getAppsOutput.stdout);
-                if (allApps.length > 0) {
+                if (getAppsOutput.stdout && JSON.parse(getAppsOutput.stdout).length > 0) {
+                    const allApps = JSON.parse(getAppsOutput.stdout);
                     const app = allApps.find((a) => {
                         return a.properties.displayName.toLowerCase() === `${args.options.displayName}`.toLowerCase();
                     });
@@ -59,15 +64,11 @@ class PaAppGetCommand extends PowerAppsCommand {
                         await logger.log(this.setProperties(app));
                     }
                     else {
-                        if (this.verbose) {
-                            await logger.logToStderr(`No app found with displayName '${args.options.displayName}'`);
-                        }
+                        throw `No app found with displayName '${args.options.displayName}'.`;
                     }
                 }
                 else {
-                    if (this.verbose) {
-                        await logger.logToStderr('No apps found');
-                    }
+                    throw 'No apps found.';
                 }
             }
         }
@@ -82,7 +83,9 @@ class PaAppGetCommand extends PowerAppsCommand {
         const options = {
             output: 'json',
             debug: this.debug,
-            verbose: this.verbose
+            verbose: this.verbose,
+            environmentName: args.options.environmentName,
+            asAdmin: args.options.asAdmin
         };
         return await cli.executeCommandWithOutput(paAppListCommand, { options: { ...options, _: [] } });
     }
@@ -98,7 +101,9 @@ _PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = fun
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             name: typeof args.options.name !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined'
+            displayName: typeof args.options.displayName !== 'undefined',
+            asAdmin: !!args.options.asAdmin,
+            environmentName: typeof args.options.environmentName !== 'undefined'
         });
     });
 }, _PaAppGetCommand_initOptions = function _PaAppGetCommand_initOptions() {
@@ -106,12 +111,22 @@ _PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = fun
         option: '-n, --name [name]'
     }, {
         option: '-d, --displayName [displayName]'
+    }, {
+        option: '-e, --environmentName [environmentName]'
+    }, {
+        option: '--asAdmin'
     });
 }, _PaAppGetCommand_initValidators = function _PaAppGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.name && !validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
+        if (args.options.asAdmin && !args.options.environmentName) {
+            return 'When specifying the asAdmin option, the environment option is required as well.';
+        }
+        if (args.options.environmentName && !args.options.asAdmin) {
+            return 'When specifying the environment option, the asAdmin option is required as well.';
+        }
         return true;
     });
 }, _PaAppGetCommand_initOptionSets = function _PaAppGetCommand_initOptionSets() {

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PaAppOwnerSetCommand_instances, _a, _PaAppOwnerSetCommand_initTelemetry, _PaAppOwnerSetCommand_initOptions, _PaAppOwnerSetCommand_initValidators, _PaAppOwnerSetCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
 import commands from '../../commands.js';
@@ -52,7 +52,7 @@ class PaAppOwnerSetCommand extends PowerAppsCommand {
         if (options.userId) {
             return options.userId;
         }
-        return aadUser.getUserIdByUpn(options.userName);
+        return entraUser.getUserIdByUpn(options.userName);
     }
 }
 _a = PaAppOwnerSetCommand, _PaAppOwnerSetCommand_instances = new WeakSet(), _PaAppOwnerSetCommand_initTelemetry = function _PaAppOwnerSetCommand_initTelemetry() {

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

@@ -6,8 +6,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
@@ -78,11 +78,11 @@ class PaAppPermissionEnsureCommand extends PowerAppsCommand {
             return options.userId;
         }
         if (options.groupName) {
-            const group = await aadGroup.getGroupByDisplayName(options.groupName);
+            const group = await entraGroup.getGroupByDisplayName(options.groupName);
             return group.id;
         }
         if (options.userName) {
-            const userId = await aadUser.getUserIdByUpn(options.userName);
+            const userId = await entraUser.getUserIdByUpn(options.userName);
             return userId;
         }
         return accessToken.getTenantIdFromAccessToken(Auth.service.accessTokens[Auth.defaultResource].accessToken);

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

@@ -7,8 +7,8 @@ var _PaAppPermissionRemoveCommand_instances, _PaAppPermissionRemoveCommand_initT
 import Auth from '../../../../Auth.js';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
@@ -74,11 +74,11 @@ class PaAppPermissionRemoveCommand extends PowerAppsCommand {
             return options.userId;
         }
         if (options.groupName) {
-            const group = await aadGroup.getGroupByDisplayName(options.groupName);
+            const group = await entraGroup.getGroupByDisplayName(options.groupName);
             return group.id;
         }
         if (options.userName) {
-            const userId = await aadUser.getUserIdByUpn(options.userName);
+            const userId = await entraUser.getUserIdByUpn(options.userName);
             return userId;
         }
         return `tenant-${accessToken.getTenantIdFromAccessToken(Auth.service.accessTokens[Auth.defaultResource].accessToken)}`;

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

@@ -30,8 +30,13 @@ class PaAppRemoveCommand extends PowerAppsCommand {
             await logger.logToStderr(`Removing Microsoft Power App ${args.options.name}...`);
         }
         const removePaApp = async () => {
+            let endpoint = `${this.resource}/providers/Microsoft.PowerApps`;
+            if (args.options.asAdmin) {
+                endpoint += `/scopes/admin/environments/${formatting.encodeQueryParameter(args.options.environmentName)}`;
+            }
+            endpoint += `/apps/${formatting.encodeQueryParameter(args.options.name)}?api-version=2017-08-01`;
             const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.PowerApps/apps/${formatting.encodeQueryParameter(args.options.name)}?api-version=2017-08-01`,
+                url: endpoint,
                 fullResponse: true,
                 headers: {
                     accept: 'application/json'
@@ -64,7 +69,9 @@ class PaAppRemoveCommand extends PowerAppsCommand {
 _PaAppRemoveCommand_instances = new WeakSet(), _PaAppRemoveCommand_initTelemetry = function _PaAppRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            force: typeof args.options.force !== 'undefined'
+            force: typeof args.options.force !== 'undefined',
+            asAdmin: !!args.options.asAdmin,
+            environmentName: typeof args.options.environmentName !== 'undefined'
         });
     });
 }, _PaAppRemoveCommand_initOptions = function _PaAppRemoveCommand_initOptions() {
@@ -72,12 +79,22 @@ _PaAppRemoveCommand_instances = new WeakSet(), _PaAppRemoveCommand_initTelemetry
         option: '-n, --name <name>'
     }, {
         option: '-f, --force'
+    }, {
+        option: '--asAdmin'
+    }, {
+        option: '-e, --environmentName [environmentName]'
     });
 }, _PaAppRemoveCommand_initValidators = function _PaAppRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
+        if (args.options.asAdmin && !args.options.environmentName) {
+            return 'When specifying the asAdmin option, the environment option is required as well.';
+        }
+        if (args.options.environmentName && !args.options.asAdmin) {
+            return 'When specifying the environment option, the asAdmin option is required as well.';
+        }
         return true;
     });
 };

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerBucketAddCommand_instances, _PlannerBucketAddCommand_initTelemetry, _PlannerBucketAddCommand_initOptions, _PlannerBucketAddCommand_initValidators, _PlannerBucketAddCommand_initOptionSets, _PlannerBucketAddCommand_initTypes;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -67,7 +67,7 @@ class PlannerBucketAddCommand extends GraphCommand {
         if (args.options.ownerGroupId) {
             return args.options.ownerGroupId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName);
         return group.id;
     }
 }

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerBucketGetCommand_instances, _PlannerBucketGetCommand_initTelemetry, _PlannerBucketGetCommand_initOptions, _PlannerBucketGetCommand_initValidators, _PlannerBucketGetCommand_initOptionSets, _PlannerBucketGetCommand_initTypes;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -91,7 +91,7 @@ class PlannerBucketGetCommand extends GraphCommand {
         if (ownerGroupId) {
             return ownerGroupId;
         }
-        const group = await aadGroup.getGroupByDisplayName(ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(ownerGroupName);
         return group.id;
     }
 }

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _PlannerBucketListCommand_instances, _PlannerBucketListCommand_initTelemetry, _PlannerBucketListCommand_initOptions, _PlannerBucketListCommand_initValidators, _PlannerBucketListCommand_initOptionSets, _PlannerBucketListCommand_initTypes;
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
 import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
@@ -55,7 +55,7 @@ class PlannerBucketListCommand extends GraphCommand {
         if (args.options.ownerGroupId) {
             return args.options.ownerGroupId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName);
         return group.id;
     }
 }

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

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerBucketRemoveCommand_instances, _PlannerBucketRemoveCommand_initTelemetry, _PlannerBucketRemoveCommand_initOptions, _PlannerBucketRemoveCommand_initValidators, _PlannerBucketRemoveCommand_initOptionSets, _PlannerBucketRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -104,7 +104,7 @@ class PlannerBucketRemoveCommand extends GraphCommand {
         if (ownerGroupId) {
             return ownerGroupId;
         }
-        const group = await aadGroup.getGroupByDisplayName(ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(ownerGroupName);
         return group.id;
     }
 }

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerBucketSetCommand_instances, _PlannerBucketSetCommand_initTelemetry, _PlannerBucketSetCommand_initOptions, _PlannerBucketSetCommand_initValidators, _PlannerBucketSetCommand_initOptionSets, _PlannerBucketSetCommand_initTypes;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -101,7 +101,7 @@ class PlannerBucketSetCommand extends GraphCommand {
         if (ownerGroupId) {
             return ownerGroupId;
         }
-        const group = await aadGroup.getGroupByDisplayName(ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(ownerGroupName);
         return group.id;
     }
 }

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

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerPlanAddCommand_instances, _PlannerPlanAddCommand_initTelemetry, _PlannerPlanAddCommand_initOptions, _PlannerPlanAddCommand_initValidators, _PlannerPlanAddCommand_initOptionSets, _PlannerPlanAddCommand_initTypes;
 import { CommandError } from '../../../../Command.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -134,7 +134,7 @@ class PlannerPlanAddCommand extends GraphCommand {
         if (args.options.ownerGroupId) {
             return args.options.ownerGroupId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName);
         return group.id;
     }
 }

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerPlanGetCommand_instances, _PlannerPlanGetCommand_initTelemetry, _PlannerPlanGetCommand_initOptions, _PlannerPlanGetCommand_initValidators, _PlannerPlanGetCommand_initOptionSets, _PlannerPlanGetCommand_initTypes;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -74,7 +74,7 @@ class PlannerPlanGetCommand extends GraphCommand {
         if (args.options.ownerGroupId) {
             return args.options.ownerGroupId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName);
         return group.id;
     }
 }

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _PlannerPlanListCommand_instances, _PlannerPlanListCommand_initTelemetry, _PlannerPlanListCommand_initOptions, _PlannerPlanListCommand_initValidators, _PlannerPlanListCommand_initOptionSets, _PlannerPlanListCommand_initTypes;
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -49,7 +49,7 @@ class PlannerPlanListCommand extends GraphCommand {
         if (args.options.ownerGroupId) {
             return args.options.ownerGroupId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName);
         return group.id;
     }
 }

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

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerPlanRemoveCommand_instances, _PlannerPlanRemoveCommand_initTelemetry, _PlannerPlanRemoveCommand_initOptions, _PlannerPlanRemoveCommand_initValidators, _PlannerPlanRemoveCommand_initOptionSets, _PlannerPlanRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -68,7 +68,7 @@ class PlannerPlanRemoveCommand extends GraphCommand {
         if (ownerGroupId) {
             return ownerGroupId;
         }
-        const group = await aadGroup.getGroupByDisplayName(ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(ownerGroupName);
         return group.id;
     }
 }

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerPlanSetCommand_instances, _PlannerPlanSetCommand_initTelemetry, _PlannerPlanSetCommand_initOptions, _PlannerPlanSetCommand_initValidators, _PlannerPlanSetCommand_initOptionSets, _PlannerPlanSetCommand_initTypes;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
@@ -38,7 +38,7 @@ class PlannerPlanSetCommand extends GraphCommand {
         if (ownerGroupId) {
             return ownerGroupId;
         }
-        const group = await aadGroup.getGroupByDisplayName(ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(ownerGroupName);
         return group.id;
     }
     async getPlanId(args) {

package/dist/m365/planner/commands/roster/roster-member-add.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerRosterMemberAddCommand_instances, _PlannerRosterMemberAddCommand_initTelemetry, _PlannerRosterMemberAddCommand_initOptions, _PlannerRosterMemberAddCommand_initOptionSets, _PlannerRosterMemberAddCommand_initValidators, _PlannerRosterMemberAddCommand_initTypes;
 import request from '../../../../request.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -55,7 +55,7 @@ class PlannerRosterMemberAddCommand extends GraphCommand {
         if (args.options.userId) {
             return args.options.userId;
         }
-        const userId = await aadUser.getUserIdByUpn(args.options.userName);
+        const userId = await entraUser.getUserIdByUpn(args.options.userName);
         return userId;
     }
 }

package/dist/m365/planner/commands/roster/roster-member-get.js

@@ -8,7 +8,7 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 class PlannerRosterMemberGetCommand extends GraphCommand {
     get name() {
         return commands.ROSTER_MEMBER_GET;
@@ -49,7 +49,7 @@ class PlannerRosterMemberGetCommand extends GraphCommand {
         if (args.options.userId) {
             return args.options.userId;
         }
-        return aadUser.getUserIdByUpn(args.options.userName);
+        return entraUser.getUserIdByUpn(args.options.userName);
     }
 }
 _PlannerRosterMemberGetCommand_instances = new WeakSet(), _PlannerRosterMemberGetCommand_initTelemetry = function _PlannerRosterMemberGetCommand_initTelemetry() {