@pnp/cli-microsoft365 7.2.0-beta.54705a9 → 7.2.0-beta.ba91bbd

package/.eslintrc.cjs

@@ -5,6 +5,7 @@ const dictionary = [
   'activation',
   'activations',
   'adaptive',
+  'administrative',
   'ai',
   'app',
   'application',
@@ -90,6 +91,7 @@ const dictionary = [
   'threat',
   'token',
   'type',
+  'unit',
   'user',
   'web',
   'webhook'

package/dist/cli/Cli.js

@@ -707,9 +707,10 @@ export class Cli {
             const maxLength = Math.max(...namesOfCommandsToPrint.map(s => s.length)) + 10;
             Cli.log(`Commands:`);
             Cli.log();
-            for (const commandName in commandsToPrint) {
+            const sortedCommandNamesToPrint = Object.getOwnPropertyNames(commandsToPrint).sort();
+            sortedCommandNamesToPrint.forEach(commandName => {
                 Cli.log(`  ${`${commandName} [options]`.padEnd(maxLength, ' ')}  ${commandsToPrint[commandName].command.description}`);
-            }
+            });
         }
         const namesOfCommandGroupsToPrint = Object.keys(commandGroupsToPrint);
         if (namesOfCommandGroupsToPrint.length > 0) {

package/dist/m365/aad/commands/administrativeunit/administrativeunit-add.js

@@ -0,0 +1,61 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _AadAdministrativeUnitAddCommand_instances, _AadAdministrativeUnitAddCommand_initTelemetry, _AadAdministrativeUnitAddCommand_initOptions;
+import request from "../../../../request.js";
+import GraphCommand from "../../../base/GraphCommand.js";
+import commands from "../../commands.js";
+class AadAdministrativeUnitAddCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_ADD;
+    }
+    get description() {
+        return 'Creates an administrative unit';
+    }
+    constructor() {
+        super();
+        _AadAdministrativeUnitAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitAddCommand_instances, "m", _AadAdministrativeUnitAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitAddCommand_instances, "m", _AadAdministrativeUnitAddCommand_initOptions).call(this);
+    }
+    async commandAction(logger, args) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/directory/administrativeUnits`,
+            headers: {
+                'accept': 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                description: args.options.description,
+                displayName: args.options.displayName,
+                visibility: args.options.hiddenMembership ? 'HiddenMembership' : null
+            }
+        };
+        try {
+            const administrativeUnit = await request.post(requestOptions);
+            await logger.log(administrativeUnit);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_AadAdministrativeUnitAddCommand_instances = new WeakSet(), _AadAdministrativeUnitAddCommand_initTelemetry = function _AadAdministrativeUnitAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            hiddenMembership: args.options.hiddenMembership
+        });
+    });
+}, _AadAdministrativeUnitAddCommand_initOptions = function _AadAdministrativeUnitAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --displayName <displayName>'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '--hiddenMembership [hiddenMembership]'
+    });
+};
+export default new AadAdministrativeUnitAddCommand();
+//# sourceMappingURL=administrativeunit-add.js.map

package/dist/m365/aad/commands/administrativeunit/administrativeunit-get.js

@@ -0,0 +1,93 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _AadAdministrativeUnitGetCommand_instances, _AadAdministrativeUnitGetCommand_initTelemetry, _AadAdministrativeUnitGetCommand_initOptions, _AadAdministrativeUnitGetCommand_initValidators, _AadAdministrativeUnitGetCommand_initOptionSets, _AadAdministrativeUnitGetCommand_initTypes;
+import { validation } from "../../../../utils/validation.js";
+import request from "../../../../request.js";
+import GraphCommand from "../../../base/GraphCommand.js";
+import commands from "../../commands.js";
+import { odata } from "../../../../utils/odata.js";
+import { formatting } from "../../../../utils/formatting.js";
+import { Cli } from "../../../../cli/Cli.js";
+class AadAdministrativeUnitGetCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_GET;
+    }
+    get description() {
+        return 'Gets information about a specific administrative unit';
+    }
+    constructor() {
+        super();
+        _AadAdministrativeUnitGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitGetCommand_instances, "m", _AadAdministrativeUnitGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitGetCommand_instances, "m", _AadAdministrativeUnitGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitGetCommand_instances, "m", _AadAdministrativeUnitGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitGetCommand_instances, "m", _AadAdministrativeUnitGetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitGetCommand_instances, "m", _AadAdministrativeUnitGetCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        let administrativeUnit;
+        try {
+            if (args.options.id) {
+                administrativeUnit = await this.getAdministrativeUnitById(args.options.id);
+            }
+            else {
+                administrativeUnit = await this.getAdministrativeUnitByDisplayName(args.options.displayName);
+            }
+            await logger.log(administrativeUnit);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getAdministrativeUnitById(id) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/directory/administrativeUnits/${id}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return await request.get(requestOptions);
+    }
+    async getAdministrativeUnitByDisplayName(displayName) {
+        const administrativeUnits = await odata.getAllItems(`${this.resource}/v1.0/directory/administrativeUnits?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'`);
+        if (administrativeUnits.length === 0) {
+            throw `The specified administrative unit '${displayName}' does not exist.`;
+        }
+        if (administrativeUnits.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', administrativeUnits);
+            return await Cli.handleMultipleResultsFound(`Multiple administrative units with name '${displayName}' found.`, resultAsKeyValuePair);
+        }
+        return administrativeUnits[0];
+    }
+}
+_AadAdministrativeUnitGetCommand_instances = new WeakSet(), _AadAdministrativeUnitGetCommand_initTelemetry = function _AadAdministrativeUnitGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            displayName: typeof args.options.displayName !== 'undefined'
+        });
+    });
+}, _AadAdministrativeUnitGetCommand_initOptions = function _AadAdministrativeUnitGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
+    });
+}, _AadAdministrativeUnitGetCommand_initValidators = function _AadAdministrativeUnitGetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _AadAdministrativeUnitGetCommand_initOptionSets = function _AadAdministrativeUnitGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'displayName'] });
+}, _AadAdministrativeUnitGetCommand_initTypes = function _AadAdministrativeUnitGetCommand_initTypes() {
+    this.types.string.push('displayName');
+};
+export default new AadAdministrativeUnitGetCommand();
+//# sourceMappingURL=administrativeunit-get.js.map

package/dist/m365/aad/commands/administrativeunit/administrativeunit-list.js

@@ -0,0 +1,25 @@
+import { odata } from '../../../../utils/odata.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class AadAdministrativeUnitListCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_LIST;
+    }
+    get description() {
+        return 'Retrieves a list of administrative units';
+    }
+    defaultProperties() {
+        return ['id', 'displayName', 'visibility'];
+    }
+    async commandAction(logger) {
+        try {
+            const results = await odata.getAllItems(`${this.resource}/v1.0/directory/administrativeUnits`);
+            await logger.log(results);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new AadAdministrativeUnitListCommand();
+//# sourceMappingURL=administrativeunit-list.js.map

package/dist/m365/aad/commands/administrativeunit/administrativeunit-remove.js

@@ -0,0 +1,108 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _AadAdministrativeUnitRemoveCommand_instances, _AadAdministrativeUnitRemoveCommand_initTelemetry, _AadAdministrativeUnitRemoveCommand_initOptions, _AadAdministrativeUnitRemoveCommand_initOptionSets, _AadAdministrativeUnitRemoveCommand_initValidators, _AadAdministrativeUnitRemoveCommand_initTypes;
+import { validation } from "../../../../utils/validation.js";
+import request from "../../../../request.js";
+import GraphCommand from "../../../base/GraphCommand.js";
+import commands from "../../commands.js";
+import { odata } from "../../../../utils/odata.js";
+import { formatting } from "../../../../utils/formatting.js";
+import { Cli } from "../../../../cli/Cli.js";
+class AadAdministrativeUnitRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_REMOVE;
+    }
+    get description() {
+        return 'Removes an administrative unit';
+    }
+    constructor() {
+        super();
+        _AadAdministrativeUnitRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        const removeAdministrativeUnit = async () => {
+            try {
+                let administrativeUnitId = args.options.id;
+                if (args.options.displayName) {
+                    administrativeUnitId = await this.getAdministrativeUnitIdByDisplayName(args.options.displayName);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/directory/administrativeUnits/${administrativeUnitId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                await request.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeAdministrativeUnit();
+        }
+        else {
+            const result = await Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove administrative unit '${args.options.id || args.options.displayName}'?`
+            });
+            if (result.continue) {
+                await removeAdministrativeUnit();
+            }
+        }
+    }
+    async getAdministrativeUnitIdByDisplayName(displayName) {
+        const administrativeUnits = await odata.getAllItems(`${this.resource}/v1.0/directory/administrativeUnits?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'&$select=id`);
+        if (administrativeUnits.length === 0) {
+            throw `The specified administrative unit '${displayName}' does not exist.`;
+        }
+        if (administrativeUnits.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', administrativeUnits);
+            const selectedAdministrativeUnit = await Cli.handleMultipleResultsFound(`Multiple administrative units with name '${displayName}' found.`, resultAsKeyValuePair);
+            return selectedAdministrativeUnit.id;
+        }
+        return administrativeUnits[0].id;
+    }
+}
+_AadAdministrativeUnitRemoveCommand_instances = new WeakSet(), _AadAdministrativeUnitRemoveCommand_initTelemetry = function _AadAdministrativeUnitRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: args.options.id !== 'undefined',
+            displayName: args.options.displayName !== 'undefined',
+            force: !!args.options.force
+        });
+    });
+}, _AadAdministrativeUnitRemoveCommand_initOptions = function _AadAdministrativeUnitRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
+    }, {
+        option: '-f, --force'
+    });
+}, _AadAdministrativeUnitRemoveCommand_initOptionSets = function _AadAdministrativeUnitRemoveCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['id', 'displayName']
+    });
+}, _AadAdministrativeUnitRemoveCommand_initValidators = function _AadAdministrativeUnitRemoveCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID for option id.`;
+        }
+        return true;
+    });
+}, _AadAdministrativeUnitRemoveCommand_initTypes = function _AadAdministrativeUnitRemoveCommand_initTypes() {
+    this.types.string.push('id', 'displayName');
+};
+export default new AadAdministrativeUnitRemoveCommand();
+//# sourceMappingURL=administrativeunit-remove.js.map

package/dist/m365/aad/commands.js

@@ -1,5 +1,9 @@
 const prefix = 'aad';
 export default {
+    ADMINISTRATIVEUNIT_ADD: `${prefix} administrativeunit add`,
+    ADMINISTRATIVEUNIT_GET: `${prefix} administrativeunit get`,
+    ADMINISTRATIVEUNIT_LIST: `${prefix} administrativeunit list`,
+    ADMINISTRATIVEUNIT_REMOVE: `${prefix} administrativeunit remove`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
     APP_LIST: `${prefix} app list`,

package/dist/m365/base/AppCommand.js

@@ -8,6 +8,7 @@ import fs from 'fs';
 import { Cli } from '../../cli/Cli.js';
 import Command, { CommandError } from '../../Command.js';
 import { validation } from '../../utils/validation.js';
+import { formatting } from '../../utils/formatting.js';
 class AppCommand extends Command {
     get resource() {
         return 'https://graph.microsoft.com';
@@ -52,18 +53,8 @@ class AppCommand extends Command {
             return super.action(logger, args);
         }
         if (this.m365rcJson.apps.length > 1) {
-            const result = await Cli.prompt({
-                message: `Multiple Azure AD apps found in ${m365rcJsonPath}. Which app would you like to use?`,
-                type: 'list',
-                choices: this.m365rcJson.apps.map((app, i) => {
-                    return {
-                        name: `${app.name} (${app.appId})`,
-                        value: i
-                    };
-                }),
-                default: 0,
-                name: 'appIdIndex'
-            });
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('appIdIndex', this.m365rcJson.apps);
+            const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD apps found in ${m365rcJsonPath}.`, resultAsKeyValuePair);
             this.appId = this.m365rcJson.apps[result.appIdIndex].appId;
             await super.action(logger, args);
         }

package/dist/m365/teams/commands/app/app-update.js

@@ -11,6 +11,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class TeamsAppUpdateCommand extends GraphCommand {
     get name() {
         return commands.APP_UPDATE;
@@ -29,7 +30,7 @@ class TeamsAppUpdateCommand extends GraphCommand {
     async commandAction(logger, args) {
         const { filePath } = args.options;
         try {
-            const appId = await this.getAppId(args);
+            const appId = await this.getAppId(args.options);
             const fullPath = path.resolve(filePath);
             if (this.verbose) {
                 await logger.logToStderr(`Updating app with id '${appId}' and file '${fullPath}' in the app catalog...`);
@@ -47,12 +48,12 @@ class TeamsAppUpdateCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getAppId(args) {
-        if (args.options.id) {
-            return args.options.id;
+    async getAppId(options) {
+        if (options.id) {
+            return options.id;
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${formatting.encodeQueryParameter(args.options.name)}'`,
+            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${formatting.encodeQueryParameter(options.name)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -64,7 +65,9 @@ class TeamsAppUpdateCommand extends GraphCommand {
             throw `The specified Teams app does not exist`;
         }
         if (response.value.length > 1) {
-            throw `Multiple Teams apps with name ${args.options.name} found. Please choose one of these ids: ${response.value.map(x => x.id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+            const result = await Cli.handleMultipleResultsFound(`Multiple Teams apps with name ${options.name} found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return app.id;
     }

package/dist/utils/aadGroup.js

@@ -54,7 +54,9 @@ export const aadGroup = {
             throw Error(`The specified group '${displayName}' does not exist.`);
         }
         if (groups.length > 1) {
-            throw Error(`Multiple groups with name '${displayName}' found: ${groups.map(x => x.id).join(',')}.`);
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', groups);
+            const result = await Cli.handleMultipleResultsFound(`Multiple groups with name '${displayName}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return groups[0].id;
     },

package/docs/docs/cmd/aad/administrativeunit/administrativeunit-add.mdx

@@ -0,0 +1,115 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# aad administrativeunit add
+
+Creates a new administrative unit
+
+## Usage
+
+```sh
+m365 aad administrativeunit add [options]
+```
+
+## Options
+
+```md definition-list
+`-n, --displayname <displayName>`
+: Display name for the administrative unit.
+
+`-d, --description [description]`
+: Description for the administrative unit.
+
+`--hiddenMembership [hiddenMembership]`
+: Indicates whether the administrative unit and its members are hidden.
+```
+
+<Global />
+
+## Remarks
+
+:::info
+
+To use this command you must be either **Global Administrator** or **Privileged Role Administrator**.
+
+:::
+
+## Examples
+
+Create an administrative unit with a specific display name
+
+```sh
+m365 aad administrativeunit add --displayName 'Marketing Division'
+```
+
+Create an administrative unit with a specific display name and description
+
+```sh
+m365 aad administrativeunit add --displayName 'Marketing Division' --description 'Marketing department administration'
+```
+
+Create a hidden administrative unit with a specific display name
+
+```sh
+m365 aad administrativeunit add --displayName 'Marketing Division' --hiddenMembership
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  {
+    "id": "00b45a1b-7632-4e94-a3bd-f06aec976d31",
+    "deletedDateTime": null,
+    "displayName": "Marketing Division",
+    "description": "Marketing department administration",
+    "membershipRule": null,
+    "membershipType": null,
+    "membershipRuleProcessingState": null,
+    "visibility": null
+  }
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  deletedDateTime              : null
+  description                  : Marketing department administration
+  displayName                  : Marketing Division
+  id                           : 00b45a1b-7632-4e94-a3bd-f06aec976d31
+  membershipRule               : null
+  membershipRuleProcessingState: null
+  membershipType               : null
+  visibility                   : null
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  id,displayName,description,visibility
+  00b45a1b-7632-4e94-a3bd-f06aec976d31,Marketing Division,Marketing department administration,HiddenMembership
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  Date: 10/23/2023
+
+  ## Marketing Division (00b45a1b-7632-4e94-a3bd-f06aec976d31)
+
+  Property | Value
+  ---------|-------
+  id | 00b45a1b-7632-4e94-a3bd-f06aec976d31
+  displayName | Marketing Division
+  description | Marketing department administration
+  visibility | HiddenMembership
+  ```
+
+  </TabItem>
+</Tabs>

package/docs/docs/cmd/aad/administrativeunit/administrativeunit-get.mdx

@@ -0,0 +1,98 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# aad administrativeunit get
+
+Gets information about a specific administrative unit
+
+## Usage
+
+```sh
+m365 aad administrativeunit get [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --id [id]`
+: The id of the administrative unit. Specify either `id` or `displayName` but not both.
+
+`-n, --displayName [displayName]`
+: The display name of the administrative unit. Specify either `id` or `displayName` but not both.
+```
+
+<Global />
+
+## Examples
+
+Get information about the administrative unit by its id
+
+```sh
+m365 aad administrativeunit get --id 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7
+```
+
+Get information about the administrative unit by its display name
+
+```sh
+m365 aad administrativeunit get --displayName 'Marketing Division'
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  {
+    "id": "0a22c83d-c4ac-43e2-bb5e-87af3015d49f",
+    "deletedDateTime": null,
+    "displayName": "Marketing Division",
+    "description": "Marketing Department Administration",
+    "membershipRule": null,
+    "membershipType": null,
+    "membershipRuleProcessingState": null,
+    "visibility": "HiddenMembership"
+  }
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  deletedDateTime              : null
+  description                  : Marketing Department Administration
+  displayName                  : Marketing Division
+  id                           : 0a22c83d-c4ac-43e2-bb5e-87af3015d49f
+  membershipRule               : null
+  membershipRuleProcessingState: null
+  membershipType               : null
+  visibility                   : HiddenMembership
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  id,displayName,description,visibility
+  0a22c83d-c4ac-43e2-bb5e-87af3015d49f,Marketing Division,Marketing Department Administration,HiddenMembership
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  Date: 10/23/2023
+
+  ## Marketing Division (0a22c83d-c4ac-43e2-bb5e-87af3015d49f)
+
+  Property | Value
+  ---------|-------
+  id | 0a22c83d-c4ac-43e2-bb5e-87af3015d49f
+  displayName | Marketing Division
+  description | Marketing Department Administration
+  visibility | HiddenMembership
+  ```
+
+  </TabItem>
+</Tabs>

package/docs/docs/cmd/aad/administrativeunit/administrativeunit-list.mdx

@@ -0,0 +1,83 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# aad administrativeunit list
+
+Retrieves a list of administrative units
+
+## Usage
+
+```sh
+m365 aad administrativeunit list [options]
+```
+
+## Options
+
+<Global />
+
+## Examples
+
+Retrieve a list of administrative units
+
+```sh
+m365 aad administrativeunit list
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  [
+    {
+      "id": "0a22c83d-c4ac-43e2-bb5e-87af3015d49f",
+      "deletedDateTime": null,
+      "displayName": "Marketing Department",
+      "description": "Marketing Department Administration",
+      "membershipRule": null,
+      "membershipType": null,
+      "membershipRuleProcessingState": null,
+      "visibility": "HiddenMembership"
+    }
+  ]
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  displayName: 0a22c83d-c4ac-43e2-bb5e-87af3015d49f
+  id         : Marketing Department
+  visibility : HiddenMembership
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  id,displayName,description,visibility
+  0a22c83d-c4ac-43e2-bb5e-87af3015d49f,Marketing Department,Marketing Department Administration,HiddenMembership
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  # aad administrativeunit list
+
+  Date: 2023-10-16
+
+  ## Marketing Department (0a22c83d-c4ac-43e2-bb5e-87af3015d49f)
+
+  Property | Value
+  ---------|-------
+  id | 0a22c83d-c4ac-43e2-bb5e-87af3015d49f
+  displayName | Marketing Department
+  description | Marketing Department Administration
+  visibility | HiddenMembership
+  ```
+
+  </TabItem>
+</Tabs>

package/docs/docs/cmd/aad/administrativeunit/administrativeunit-remove.mdx

@@ -0,0 +1,52 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# aad administrativeunit remove
+
+Removes an administrative unit
+
+## Usage
+
+```sh
+m365 aad administrativeunit remove [options]
+```
+
+## options
+
+```md definition-list
+`-i, --id [id]`
+: The id of the administrative unit. Specify either `id` or `displayName` but not both.
+
+`-n, --displayName [displayName]`
+: The display name of the administrative unit. Specify either `id` or `displayName` but not both.
+
+`-f, --force [force]`
+: Don't prompt for confirmation.
+```
+
+<Global />
+
+## Remarks
+
+:::info
+
+To use this command you must be either **Global Administrator** or **Privileged Role Administrator**.
+
+:::
+
+## Examples
+
+Remove an administrative unit by its id
+
+```sh
+m365 aad administrativeunit remove --id 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7
+```
+
+Remove an administrative unit by it displayName
+
+```sh
+m365 aad administrativeunit remove --displayName 'Marketing Division'
+```
+
+## Response
+
+The command won't return a response on success

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "7.2.0-beta.54705a9",
+  "version": "7.2.0-beta.ba91bbd",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",
@@ -173,6 +173,7 @@
     "Lengelle, Veronique <25181757+veronicageek@users.noreply.github.com>",
     "Levert, Sebastien <slevert@outlook.com>",
     "Lingstuyl, Martin <mlingstuyl@live.com>",
+    "Macháček, Martin <machacek@edhouse.cz>",
     "Maillot, Michaël <battosaimykle@gmail.com>",
     "Mastykarz, Waldek <waldek@mastykarz.nl>",
     "McDonnell, Kevin <kevin@mcd79.com>",