@pnp/cli-microsoft365 7.4.0-beta.5820537 → 7.4.0-beta.8d6724f

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/spo/commands/group/group-member-add.js

@@ -32,6 +32,14 @@ class SpoGroupMemberAddCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
+            if (args.options.aadGroupIds) {
+                args.options.entraGroupIds = args.options.aadGroupIds;
+                this.warn(logger, `Option 'aadGroupIds' is deprecated. Please use 'entraGroupIds' instead`);
+            }
+            if (args.options.aadGroupNames) {
+                args.options.entraGroupNames = args.options.aadGroupNames;
+                this.warn(logger, `Option 'aadGroupNames' is deprecated. Please use 'entraGroupNames' instead`);
+            }
             const groupId = await this.getGroupId(args, logger);
             const resolvedUsernameList = await this.getValidUsers(args, logger);
             if (this.verbose) {
@@ -82,7 +90,7 @@ class SpoGroupMemberAddCommand extends SpoCommand {
             await logger.logToStderr('Checking if the specified users and groups exist');
         }
         const validUserNames = [];
-        const identifiers = args.options.userNames ?? args.options.emails ?? args.options.aadGroupIds ?? args.options.aadGroupNames ?? args.options.userIds.toString();
+        const identifiers = args.options.userNames ?? args.options.emails ?? args.options.entraGroupIds ?? args.options.entraGroupNames ?? args.options.userIds.toString();
         await Promise.all(identifiers.split(',').map(async (identifier) => {
             const trimmedIdentifier = identifier.trim();
             try {
@@ -96,10 +104,10 @@ class SpoGroupMemberAddCommand extends SpoCommand {
                 else if (args.options.userNames) {
                     validUserNames.push(trimmedIdentifier);
                 }
-                else if (args.options.aadGroupIds) {
+                else if (args.options.entraGroupIds) {
                     validUserNames.push(trimmedIdentifier);
                 }
-                else if (args.options.aadGroupNames) {
+                else if (args.options.entraGroupNames) {
                     if (this.verbose) {
                         await logger.logToStderr(`Getting ID of Azure AD group ${trimmedIdentifier}`);
                     }
@@ -135,7 +143,9 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
             userNames: typeof args.options.userNames !== 'undefined',
             emails: typeof args.options.emails !== 'undefined',
             userIds: typeof args.options.userIds !== 'undefined',
+            entraGroupIds: typeof args.options.entraGroupIds !== 'undefined',
             aadGroupIds: typeof args.options.aadGroupIds !== 'undefined',
+            entraGroupNames: typeof args.options.entraGroupNames !== 'undefined',
             aadGroupNames: typeof args.options.aadGroupNames !== 'undefined'
         });
     });
@@ -152,8 +162,12 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         option: '--emails [emails]'
     }, {
         option: '--userIds [userIds]'
+    }, {
+        option: '--entraGroupIds [entraGroupIds]'
     }, {
         option: '--aadGroupIds [aadGroupIds]'
+    }, {
+        option: '--entraGroupNames [entraGroupNames]'
     }, {
         option: '--aadGroupNames [aadGroupNames]'
     });
@@ -176,13 +190,16 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         if (args.options.emails && args.options.emails.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
             return `${args.options.emails} contains one or more invalid email addresses`;
         }
+        if (args.options.entraGroupIds && args.options.entraGroupIds.split(',').some(e => !validation.isValidGuid(e))) {
+            return `${args.options.entraGroupIds} contains one or more invalid GUIDs`;
+        }
         if (args.options.aadGroupIds && args.options.aadGroupIds.split(',').some(e => !validation.isValidGuid(e))) {
             return `${args.options.aadGroupIds} contains one or more invalid GUIDs`;
         }
         return true;
     });
 }, _SpoGroupMemberAddCommand_initOptionSets = function _SpoGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userNames', 'emails', 'userIds', 'aadGroupIds', 'aadGroupNames'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userNames', 'emails', 'userIds', 'entraGroupIds', 'aadGroupIds', 'entraGroupNames', 'aadGroupNames'] });
 };
 export default new SpoGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map

package/dist/m365/spo/commands/group/group-member-remove.js

@@ -45,6 +45,14 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
         return userOutput.userPrincipalName;
     }
     async commandAction(logger, args) {
+        if (args.options.aadGroupId) {
+            args.options.entraGroupId = args.options.aadGroupId;
+            this.warn(logger, `Option 'aadGroupId' is deprecated. Please use 'entraGroupId' instead`);
+        }
+        if (args.options.aadGroupName) {
+            args.options.entraGroupName = args.options.aadGroupName;
+            this.warn(logger, `Option 'aadGroupName' is deprecated. Please use 'entraGroupName' instead`);
+        }
         if (args.options.force) {
             if (this.debug) {
                 await logger.logToStderr('Confirmation bypassed by entering confirm option. Removing the user from SharePoint Group...');
@@ -52,7 +60,7 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
             await this.removeUserfromSPGroup(logger, args);
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove user ${args.options.userName || args.options.userId || args.options.email || args.options.aadGroupId || args.options.aadGroupName} from the SharePoint group?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove user ${args.options.userName || args.options.userId || args.options.email || args.options.entraGroupId || args.options.entraGroupName} from the SharePoint group?` });
             if (result) {
                 await this.removeUserfromSPGroup(logger, args);
             }
@@ -60,7 +68,7 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
     }
     async removeUserfromSPGroup(logger, args) {
         if (this.verbose) {
-            await logger.logToStderr(`Removing User ${args.options.userName || args.options.email || args.options.userId || args.options.aadGroupId || args.options.aadGroupName} from Group: ${args.options.groupId || args.options.groupName}`);
+            await logger.logToStderr(`Removing User ${args.options.userName || args.options.email || args.options.userId || args.options.entraGroupId || args.options.entraGroupName} from Group: ${args.options.groupId || args.options.groupName}`);
         }
         let requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
             ? `GetById('${args.options.groupId}')`
@@ -74,8 +82,8 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
             requestUrl += `/users/removeByLoginName(@LoginName)?@LoginName='${formatting.encodeQueryParameter(loginName)}'`;
         }
         else {
-            const aadGroupId = await this.getGroupId(args);
-            requestUrl += `/users/RemoveById(${aadGroupId})`;
+            const entraGroupId = await this.getGroupId(args);
+            requestUrl += `/users/RemoveById(${entraGroupId})`;
         }
         const requestOptions = {
             url: requestUrl,
@@ -107,14 +115,14 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
         const output = await cli.executeCommandWithOutput(SpoGroupMemberListCommand, { options: { ...options, _: [] } });
         const getGroupMemberListOutput = JSON.parse(output.stdout);
         let foundGroups;
-        if (args.options.aadGroupId) {
-            foundGroups = getGroupMemberListOutput.filter((x) => { return x.LoginName.indexOf(args.options.aadGroupId) > -1 && (x.LoginName.indexOf("c:0o.c|federateddirectoryclaimprovider|") === 0 || x.LoginName.indexOf("c:0t.c|tenant|") === 0); });
+        if (args.options.entraGroupId) {
+            foundGroups = getGroupMemberListOutput.filter((x) => { return x.LoginName.indexOf(args.options.entraGroupId) > -1 && (x.LoginName.indexOf("c:0o.c|federateddirectoryclaimprovider|") === 0 || x.LoginName.indexOf("c:0t.c|tenant|") === 0); });
         }
         else {
-            foundGroups = getGroupMemberListOutput.filter((x) => { return x.Title === args.options.aadGroupName && (x.LoginName.indexOf("c:0o.c|federateddirectoryclaimprovider|") === 0 || x.LoginName.indexOf("c:0t.c|tenant|") === 0); });
+            foundGroups = getGroupMemberListOutput.filter((x) => { return x.Title === args.options.entraGroupName && (x.LoginName.indexOf("c:0o.c|federateddirectoryclaimprovider|") === 0 || x.LoginName.indexOf("c:0t.c|tenant|") === 0); });
         }
         if (foundGroups.length === 0) {
-            throw `The Azure AD group ${args.options.aadGroupId || args.options.aadGroupName} is not found in SharePoint group ${args.options.groupId || args.options.groupName}`;
+            throw `The Azure AD group ${args.options.entraGroupId || args.options.entraGroupName} is not found in SharePoint group ${args.options.groupId || args.options.groupName}`;
         }
         return foundGroups[0].Id;
     }
@@ -127,8 +135,10 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
             userName: (!(!args.options.userName)).toString(),
             email: (!(!args.options.email)).toString(),
             userId: (!(!args.options.userId)).toString(),
+            entraGroupId: (!(!args.options.entraGroupId)).toString(),
             aadGroupId: (!(!args.options.groupId)).toString(),
-            aadGroupName: (!(!args.options.groupName)).toString(),
+            entraGroupName: (!(!args.options.entraGroupName)).toString(),
+            aadGroupName: (!(!args.options.aadGroupName)).toString(),
             force: (!(!args.options.force)).toString()
         });
     });
@@ -145,8 +155,12 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         option: '--email [email]'
     }, {
         option: '--userId [userId]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
     }, {
         option: '--aadGroupId [aadGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '--aadGroupName [aadGroupName]'
     }, {
@@ -166,13 +180,16 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         if (args.options.email && !validation.isValidUserPrincipalName(args.options.email)) {
             return `${args.options.email} is not a valid email`;
         }
+        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
+            return `${args.options.entraGroupId} is not a valid GUID`;
+        }
         if (args.options.aadGroupId && !validation.isValidGuid(args.options.aadGroupId)) {
             return `${args.options.aadGroupId} is not a valid GUID`;
         }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });
 }, _SpoGroupMemberRemoveCommand_initOptionSets = function _SpoGroupMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupName', 'groupId'] }, { options: ['userName', 'email', 'userId', 'aadGroupId', 'aadGroupName'] });
+    this.optionSets.push({ options: ['groupName', 'groupId'] }, { options: ['userName', 'email', 'userId', 'entraGroupId', 'aadGroupId', 'entraGroupName', 'aadGroupName'] });
 };
 export default new SpoGroupMemberRemoveCommand();
 //# sourceMappingURL=group-member-remove.js.map

package/dist/m365/spo/commands/user/user-ensure.js

@@ -25,12 +25,16 @@ class SpoUserEnsureCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoUserEnsureCommand_instances, "m", _SpoUserEnsureCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        if (args.options.aadId) {
+            args.options.entraId = args.options.aadId;
+            this.warn(logger, `Option 'aadId' is deprecated. Please use 'entraId' instead`);
+        }
         if (this.verbose) {
-            await logger.logToStderr(`Ensuring user ${args.options.aadId || args.options.userName} at site ${args.options.webUrl}`);
+            await logger.logToStderr(`Ensuring user ${args.options.entraId || args.options.userName} at site ${args.options.webUrl}`);
         }
         try {
             const requestBody = {
-                logonName: args.options.userName || await this.getUpnByUserId(args.options.aadId, logger)
+                logonName: args.options.userName || await this.getUpnByUserId(args.options.entraId, logger)
             };
             const requestOptions = {
                 url: `${args.options.webUrl}/_api/web/ensureuser`,
@@ -47,16 +51,17 @@ class SpoUserEnsureCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getUpnByUserId(aadId, logger) {
+    async getUpnByUserId(entraId, logger) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving user principal name for user with id ${aadId}`);
+            await logger.logToStderr(`Retrieving user principal name for user with id ${entraId}`);
         }
-        return await aadUser.getUpnByUserId(aadId);
+        return await aadUser.getUpnByUserId(entraId);
     }
 }
 _SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelemetry = function _SpoUserEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            entraId: typeof args.options.entraId !== 'undefined',
             aadId: typeof args.options.aadId !== 'undefined',
             userName: typeof args.options.userName !== 'undefined'
         });
@@ -64,6 +69,8 @@ _SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelem
 }, _SpoUserEnsureCommand_initOptions = function _SpoUserEnsureCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--entraId [entraId]'
     }, {
         option: '--aadId [aadId]'
     }, {
@@ -75,6 +82,9 @@ _SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelem
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
+        if (args.options.entraId && !validation.isValidGuid(args.options.entraId)) {
+            return `${args.options.entraId} is not a valid GUID.`;
+        }
         if (args.options.aadId && !validation.isValidGuid(args.options.aadId)) {
             return `${args.options.aadId} is not a valid GUID.`;
         }
@@ -84,7 +94,7 @@ _SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelem
         return true;
     });
 }, _SpoUserEnsureCommand_initOptionSets = function _SpoUserEnsureCommand_initOptionSets() {
-    this.optionSets.push({ options: ['aadId', 'userName'] });
+    this.optionSets.push({ options: ['entraId', 'aadId', 'userName'] });
 };
 export default new SpoUserEnsureCommand();
 //# sourceMappingURL=user-ensure.js.map

package/docs/docs/cmd/flow/run/run-get.mdx

@@ -25,7 +25,14 @@ m365 flow run get [options]
 : The name of the environment where the flow is located
 
 `--includeTriggerInformation`
+: (deprecated. Use option `withTrigger` instead) If specified, include information about the trigger details
+
+`--withTrigger`
 : If specified, include information about the trigger details
+
+`--withActions [withActions]`
+: If specified, include information about all actions when no action names are specified, or provide a specified list of actions separated by commas to include only the relevant action details
+
 ```
 
 <Global />
@@ -44,7 +51,7 @@ If the Microsoft Flow with the name you specified doesn't exist, you will get th
 
 If the run with the name you specified doesn't exist, you will get the `The provided workflow run name is not valid.` error.
 
-If the option `includeTriggerInformation` is specified, but the trigger does not contain an outputsLink such as for example with a `Recurrence` trigger, this option will be ignored.
+If the option `withTrigger` is specified, but the trigger does not contain an outputsLink such as for example with a `Recurrence` trigger, this option will be ignored.
 
 ## Examples
 
@@ -57,7 +64,19 @@ m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5
 Get information about the given run of the specified Power Automate flow including trigger information
 
 ```sh
-m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62 --includeTriggerInformation
+m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62 --withTrigger
+```
+
+Get information about the given run of the specified Power Automate flow including details about all associated actions.
+
+```sh
+m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62 --withActions
+```
+
+Get information about the given run of the specified Power Automate flow including exclusively the details of 'Action_Internal_Name1' and 'Action_Internal_Name2' actions
+
+```sh
+m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62 --withActions "Action_Internal_Name1,Action_Internal_Name2"
 ```
 
 ## Response
@@ -157,9 +176,9 @@ m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5
   </TabItem>
 </Tabs>
 
-### `includeTriggerInformation` response
+### `withTrigger` response
 
-When using the option `includeTriggerInformation`, the response for the json-output will differ.
+When using the option `withTrigger`, the response for the json-output will differ.
 
 <Tabs>
   <TabItem value="JSON">
@@ -233,3 +252,147 @@ When using the option `includeTriggerInformation`, the response for the json-out
   </TabItem>
 </Tabs>
 
+### `withActions` response
+
+When using the option `withActions`, the response for the json-output will differ.
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  {
+    "name": "08585236861638480597867166179CU104",
+    "id": "/providers/Microsoft.ProcessSimple/environments/Default-e1dd4023-a656-480a-8a0e-c1b1eec51e1d/flows/24335774-daf6-4183-acb7-f5155c2cd2fe/runs/08585236861638480597867166179CU104",
+    "type": "Microsoft.ProcessSimple/environments/flows/runs",
+    "properties": {
+      "actions":{
+        "Compose": {
+          "input": "Test",
+          "inputsLink": {
+            "uri": "https://prod-255.westeurope.logic.azure.com:443/workflows/88b5146587d144ea85efb15683c4e58f/runs/08586652586741142222645090602CU35/actions/Compose/contents/ActionInputs?api-version=2016-06-01&se=2023-12-14T19%3A00%3A00.0000000Z&sp=%2Fruns%2F08586652586741142222645090602CU35%2Factions%2FCompose%2Fcontents%2FActionInputs%2Fread&sv=1.0&sig=wYD6bMHjdoOawYAMTHqpmyILowLKRCkFEfsNxi1NFzw",
+            "contentVersion": "test==",
+            "contentSize": 6,
+            "contentHash": {
+              "algorithm": "md5",
+              "value": "test=="
+            }
+          },
+          "output": "Test",
+          "outputsLink": {
+            "uri": "https://prod-255.westeurope.logic.azure.com:443/workflows/88b5146587d144ea85efb15683c4e58f/runs/08586652586741142222645090602CU35/actions/Compose/contents/ActionOutputs?api-version=2016-06-01&se=2023-12-14T19%3A00%3A00.0000000Z&sp=%2Fruns%2F08586652586741142222645090602CU35%2Factions%2FCompose%2Fcontents%2FActionOutputs%2Fread&sv=1.0&sig=KoI4_RAEVNFUgymktOFxvfb5mCoIKR2WCYGwexjD7kY",
+            "contentVersion": "test==",
+            "contentSize": 6,
+            "contentHash": {
+              "algorithm": "md5",
+              "value": "test=="
+            }
+          },
+          "startTime": "2023-11-17T21:06:14.466889Z",
+          "endTime": "2023-11-17T21:06:14.4676104Z",
+          "correlation": {
+            "actionTrackingId": "dabed750-0ec4-4c34-98f5-cc3695e0811e",
+            "clientTrackingId": "08585013686846794051719443325CU251",
+            "clientKeywords": [
+              "resubmitFlow"
+            ]
+          },
+          "status": "Succeeded",
+          "code": "OK"
+        }
+      },
+      "startTime": "2023-03-04T09:05:21.8066368Z",
+      "endTime": "2023-03-04T09:05:22.5880202Z",
+      "status": "Succeeded",
+      "correlation": {
+        "clientTrackingId": "08585236861638480598867166179CU131"
+      },
+      "trigger": {
+        "name": "When_an_email_is_flagged_(V4)",
+        "inputsLink": {
+          "uri": "https://prod-130.westeurope.logic.azure.com:443/workflows/3ebadb794f6641e0b7f4fda131cdfb0b/runs/08585236861638480597867166179CU104/contents/TriggerInputs?api-version=2016-06-01&se=2023-03-04T14%3A00%3A00.0000000Z&sp=%2Fruns%2F08585236861638480597867166179CU104%2Fcontents%2FTriggerInputs%2Fread&sv=1.0&sig=",
+          "contentVersion": "2v/VLXFrKV6JvwSdcN7aHg==",
+          "contentSize": 343,
+          "contentHash": {
+            "algorithm": "md5",
+            "value": "2v/VLXFrKV6JvwSdcN7aHg=="
+          }
+        },
+        "outputsLink": {
+          "uri": "https://prod-130.westeurope.logic.azure.com:443/workflows/3ebadb794f6641e0b7f4fda131cdfb0b/runs/08585236861638480597867166179CU104/contents/TriggerOutputs?api-version=2016-06-01&se=2023-03-04T14%3A00%3A00.0000000Z&sp=%2Fruns%2F08585236861638480597867166179CU104%2Fcontents%2FTriggerOutputs%2Fread&sv=1.0&sig=",
+          "contentVersion": "AHZEeWNlQ0bLe48yDmpzrQ==",
+          "contentSize": 3478,
+          "contentHash": {
+            "algorithm": "md5",
+            "value": "AHZEeWNlQ0bLe48yDmpzrQ=="
+          }
+        },
+        "startTime": "2023-03-04T09:05:21.6192576Z",
+        "endTime": "2023-03-04T09:05:21.7442626Z",
+        "scheduledTime": "2023-03-04T09:05:21.573561Z",
+        "originHistoryName": "08585236861638480598867166179CU131",
+        "correlation": {
+          "clientTrackingId": "08585236861638480598867166179CU131"
+        },
+        "code": "OK",
+        "status": "Succeeded"
+      }
+    },
+    "startTime": "2023-03-04T09:05:21.8066368Z",
+    "endTime": "2023-03-04T09:05:22.5880202Z",
+    "status": "Succeeded",
+    "triggerName": "When_an_email_is_flagged_(V4)",
+    "triggerInformation": {
+      "from": "john@contoso.com",
+      "toRecipients": "doe@contoso.com",
+      "subject": "Dummy email",
+      "body": "<html><head>\r\\\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"></head><body><p>This is dummy content</p></body></html>",
+      "importance": "normal",
+      "bodyPreview": "This is dummy content",
+      "hasAttachments": false,
+      "id": "AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALUqy81AAA=",
+      "internetMessageId": "<DB7PR03MB5018879914324FC65695809FE1AD9@DB7PR03MB5018.eurprd03.prod.outlook.com>",
+      "conversationId": "AAQkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgAQAMqP9zsK8a1CnIYEgHclLTk=",
+      "receivedDateTime": "2023-03-01T15:06:57+00:00",
+      "isRead": false,
+      "attachments": [],
+      "isHtml": true
+    },
+    "actions": {
+      "Compose": {
+        "input": "Test",
+        "inputsLink": {
+          "uri": "https://prod-255.westeurope.logic.azure.com:443/workflows/88b5146587d144ea85efb15683c4e58f/runs/08586652586741142222645090602CU35/actions/Compose/contents/ActionInputs?api-version=2016-06-01&se=2023-12-14T19%3A00%3A00.0000000Z&sp=%2Fruns%2F08586652586741142222645090602CU35%2Factions%2FCompose%2Fcontents%2FActionInputs%2Fread&sv=1.0&sig=wYD6bMHjdoOawYAMTHqpmyILowLKRCkFEfsNxi1NFzw",
+          "contentVersion": "test==",
+          "contentSize": 6,
+          "contentHash": {
+            "algorithm": "md5",
+            "value": "test=="
+          }
+        },
+        "output": "Test",
+        "outputsLink": {
+          "uri": "https://prod-255.westeurope.logic.azure.com:443/workflows/88b5146587d144ea85efb15683c4e58f/runs/08586652586741142222645090602CU35/actions/Compose/contents/ActionOutputs?api-version=2016-06-01&se=2023-12-14T19%3A00%3A00.0000000Z&sp=%2Fruns%2F08586652586741142222645090602CU35%2Factions%2FCompose%2Fcontents%2FActionOutputs%2Fread&sv=1.0&sig=KoI4_RAEVNFUgymktOFxvfb5mCoIKR2WCYGwexjD7kY",
+          "contentVersion": "test==",
+          "contentSize": 6,
+          "contentHash": {
+            "algorithm": "md5",
+            "value": "test=="
+          }
+        },
+        "startTime": "2023-11-17T21:06:14.466889Z",
+        "endTime": "2023-11-17T21:06:14.4676104Z",
+        "correlation": {
+          "actionTrackingId": "dabed750-0ec4-4c34-98f5-cc3695e0811e",
+          "clientTrackingId": "08585013686846794051719443325CU251",
+          "clientKeywords": [
+            "resubmitFlow"
+          ]
+        },
+        "status": "Succeeded",
+        "code": "OK"
+      }
+    }
+  }
+  ```
+  </TabItem>
+</Tabs>

package/docs/docs/cmd/spo/group/group-member-add.mdx

@@ -33,18 +33,24 @@ m365 spo group member add [options]
 `--userIds [userIds]`
 : The user Id of the user to add as a member. (Id of the site user, for example: 14) If multiple users need to be added, the Ids have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds` or `aadGroupNames`.
 
+`--entraGroupIds [entraGroupIds]`
+: The object Id of the Entra group to add as a member. If multiple groups need to be added, the Ids have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds`, `entraGroupIds`, `aadGroupNames`, or `entraGroupNames`.
+
 `--aadGroupIds [aadGroupIds]`
-: The object Id of the Azure AD group to add as a member. If multiple groups need to be added, the Ids have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds` or `aadGroupNames`.
+: (deprecated. Use `entraGroupIds` instead) The object Id of the Azure AD group to add as a member. If multiple groups need to be added, the Ids have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds`, `entraGroupIds`, `aadGroupNames`, or `entraGroupNames`.
+
+`--entraGroupNames [entraGroupNames]`
+: The name of the Entra group to add as a member. If multiple groups need to be added, they have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds`, `entraGroupIds`, `aadGroupNames`, or `entraGroupNames`.
 
 `--aadGroupNames [aadGroupNames]`
-: The name of the Azure AD group to add as a member. If multiple groups need to be added, they have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds` or `aadGroupNames`.
+: (deprecated. Use `entraGroupNames` instead) The name of the Azure AD group to add as a member. If multiple groups need to be added, they have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds`, `entraGroupIds`, `aadGroupNames`, or `entraGroupNames`.
 ```
 
 <Global />
 
 ## Remarks
 
-For the `userIds`, `userNames`, `emails`, `aadGroupIds` or `aadGroupNames` options you can specify multiple values by separating them with a comma. If one of the specified entries is not valid, the command will fail with an error message showing the list of invalid values.
+For the `userIds`, `userNames`, `emails`, `aadGroupIds`, `entraGroupIds`, `aadGroupNames`, or `entraGroupNames` options you can specify multiple values by separating them with a comma. If one of the specified entries is not valid, the command will fail with an error message showing the list of invalid values.
 
 ## Examples
 
@@ -84,11 +90,17 @@ Add multiple users with the userIds parameter to a SharePoint group with the gro
 m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --userIds "5,12"
 ```
 
-Add multiple users with the aadGroupNames parameter to a SharePoint group with the groupId parameter 
+Add multiple users with the entraGroupIds parameter to a SharePoint group with the groupId parameter.
+  
+```sh 
+m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --entraGroupIds "f2fb2f10-cfd2-4054-8ffd-64533657a5ab,3e86049e-89e6-4c27-bccb-d7549f0bbd06"
+```
+
+Add multiple users with the entraGroupNames parameter to a SharePoint group with the groupId parameter.
   
- ```sh 
- m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --aadGroupNames "Azure group one, Azure group two" 
- ``` 
+```sh 
+m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --entraGroupNames "Azure group one, Azure group two" 
+```
 
 ## Response
 

package/docs/docs/cmd/spo/group/group-member-remove.mdx

@@ -31,11 +31,17 @@ m365 spo group member remove [options]
 `--userId [userId]`
 : The user Id (Id of the site user, eg. 14) of the user to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId` or `aadGroupName`.
 
+`--entraGroupId [entraGroupId]`
+: The object Id of the Entra group to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId`, `entraGroupId`, `aadGroupName`, or `entraGroupName`.
+
 `--aadGroupId [aadGroupId]`
-: The object Id of the Azure AD group to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId` or `aadGroupName`.
+: (deprecated. Use `entraGroupId` instead) The object Id of the Azure AD group to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId`, `entraGroupId`, `aadGroupName`, or `entraGroupName`.
+
+`--entraGroupName [entraGroupName]`
+: The name of the Entra group to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId`, `entraGroupId`, `aadGroupName`, or `entraGroupName`.
 
 `--aadGroupName [aadGroupName]`
-: The name of the Azure AD group to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId` or `aadGroupName`.
+: (deprecated. Use `entraGroupName` instead) The name of the Azure AD group to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId`, `entraGroupId`, `aadGroupName`, or `entraGroupName`.
 ```
 
 <Global />
@@ -60,16 +66,16 @@ Remove a user from a SharePoint group by email.
 m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupName "Site A Visitors" --userId 14
 ```
 
-Remove an Azure AD group from a SharePoint group based on the Azure AD group name on a given web.
+Remove an Entra group from a SharePoint group based on the Entra group name on a given web.
 
 ```sh
-m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --aadGroupName "Azure AD Security Group"
+m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --entraGroupName "Azure AD Security Group"
 ```
 
-Remove an Azure AD group from a SharePoint group based on the Azure AD group ID on a given web.
+Remove an Entra group from a SharePoint group based on the Entra group ID on a given web.
 
 ```sh
-m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupName "Site A Visitors" --aadGroupId "5786b8e8-c495-4734-b345-756733960730"
+m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupName "Site A Visitors" --entraGroupId "5786b8e8-c495-4734-b345-756733960730"
 ```
 
 ## Response