Renames 'aad' utils to 'entra'. Closes pnp#5757

arjunumenon · Feb 6, 2024 · 423f257 · 423f257
1 parent c69a534
commit 423f257
Show file tree

Hide file tree

Showing 111 changed files with 357 additions and 358 deletions.
diff --git a/src/m365/app/commands/app-get.ts b/src/m365/app/commands/app-get.ts
@@ -1,7 +1,7 @@
 import { cli } from '../../../cli/cli.js';
 import { Logger } from '../../../cli/Logger.js';
 import Command from '../../../Command.js';
-import aadAppGetCommand, { Options as AadAppGetCommandOptions } from '../../entra/commands/app/app-get.js';
+import entraAppGetCommand, { Options as EntraAppGetCommandOptions } from '../../entra/commands/app/app-get.js';
 import AppCommand, { AppCommandArgs } from '../../base/AppCommand.js';
 import commands from '../commands.js';
 
@@ -15,15 +15,15 @@ class AppGetCommand extends AppCommand {
   }
 
   public async commandAction(logger: Logger, args: AppCommandArgs): Promise<void> {
-    const options: AadAppGetCommandOptions = {
+    const options: EntraAppGetCommandOptions = {
       appId: this.appId,
       output: 'json',
       debug: args.options.debug,
       verbose: args.options.verbose
     };
 
     try {
-      const appGetOutput = await cli.executeCommandWithOutput(aadAppGetCommand as Command, { options: { ...options, _: [] } });
+      const appGetOutput = await cli.executeCommandWithOutput(entraAppGetCommand as Command, { options: { ...options, _: [] } });
       if (this.verbose) {
         await logger.logToStderr(appGetOutput.stderr);
       }

diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-get.spec.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-get.spec.ts
@@ -12,7 +12,7 @@ import command from './administrativeunit-get.js';
 import request from '../../../../request.js';
 import { sinonUtil } from '../../../../utils/sinonUtil.js';
 import { CommandError } from '../../../../Command.js';
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import aadCommands from '../../aadCommands.js';
 
 describe(commands.ADMINISTRATIVEUNIT_GET, () => {
@@ -65,7 +65,7 @@ describe(commands.ADMINISTRATIVEUNIT_GET, () => {
   afterEach(() => {
     sinonUtil.restore([
       request.get,
-      aadAdministrativeUnit.getAdministrativeUnitByDisplayName,
+      entraAdministrativeUnit.getAdministrativeUnitByDisplayName,
       cli.handleMultipleResultsFound
     ]);
   });
@@ -107,7 +107,7 @@ describe(commands.ADMINISTRATIVEUNIT_GET, () => {
   });
 
   it('retrieves information about the specified administrative unit by displayName', async () => {
-    sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').resolves(administrativeUnitsReponse.value[0]);
+    sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').resolves(administrativeUnitsReponse.value[0]);
 
     await command.action(logger, { options: { displayName: validDisplayName } });
     assert(loggerLogSpy.calledOnceWithExactly(administrativeUnitsReponse.value[0]));

diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-get.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-get.ts
@@ -5,7 +5,7 @@ import { validation } from "../../../../utils/validation.js";
 import request, { CliRequestOptions } from "../../../../request.js";
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
-import { aadAdministrativeUnit } from "../../../../utils/aadAdministrativeUnit.js";
+import { entraAdministrativeUnit } from "../../../../utils/entraAdministrativeUnit.js";
 import aadCommands from "../../aadCommands.js";
 
 interface CommandArgs {
@@ -88,7 +88,7 @@ class EntraAdministrativeUnitGetCommand extends GraphCommand {
         administrativeUnit = await this.getAdministrativeUnitById(args.options.id);
       }
       else {
-        administrativeUnit = await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName!);
+        administrativeUnit = await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName!);
       }
 
       await logger.log(administrativeUnit);

diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-member-add.spec.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-member-add.spec.ts
@@ -12,10 +12,10 @@ import { sinonUtil } from '../../../../utils/sinonUtil.js';
 import { cli } from '../../../../cli/cli.js';
 import { CommandInfo } from '../../../../cli/CommandInfo.js';
 import command from './administrativeunit-member-add.js';
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
-import { aadUser } from '../../../../utils/aadUser.js';
-import { aadDevice } from '../../../../utils/aadDevice.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import { entraDevice } from '../../../../utils/entraDevice.js';
 import { settingsNames } from '../../../../settingsNames.js';
 import aadCommands from '../../aadCommands.js';
 
@@ -60,10 +60,10 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_ADD, () => {
   afterEach(() => {
     sinonUtil.restore([
       request.post,
-      aadAdministrativeUnit.getAdministrativeUnitByDisplayName,
-      aadUser.getUserIdByUpn,
-      aadGroup.getGroupIdByDisplayName,
-      aadDevice.getDeviceByDisplayName,
+      entraAdministrativeUnit.getAdministrativeUnitByDisplayName,
+      entraUser.getUserIdByUpn,
+      entraGroup.getGroupIdByDisplayName,
+      entraDevice.getDeviceByDisplayName,
       cli.getSettingWithDefaultValue,
       cli.handleMultipleResultsFound,
       cli.promptForSelection
@@ -374,8 +374,8 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_ADD, () => {
   });
 
   it('adds a user specified by its name to an administrative unit specified by its name (verbose)', async () => {
-    sinon.stub(aadUser, 'getUserIdByUpn').withArgs(userName).resolves(userId);
-    sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName });
+    sinon.stub(entraUser, 'getUserIdByUpn').withArgs(userName).resolves(userId);
+    sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName });
 
     const postStub = sinon.stub(request, 'post').callsFake(async (opts) => {
       if (opts.url === `https://graph.microsoft.com/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/$ref`) {
@@ -405,8 +405,8 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_ADD, () => {
   });
 
   it('adds a group specified by its name to an administrative unit specified by its name (verbose)', async () => {
-    sinon.stub(aadGroup, 'getGroupIdByDisplayName').withArgs(groupName).resolves(groupId);
-    sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName });
+    sinon.stub(entraGroup, 'getGroupIdByDisplayName').withArgs(groupName).resolves(groupId);
+    sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName });
 
     const postStub = sinon.stub(request, 'post').callsFake(async (opts) => {
       if (opts.url === `https://graph.microsoft.com/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/$ref`) {
@@ -436,8 +436,8 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_ADD, () => {
   });
 
   it('adds a device specified by its name to an administrative unit specified by its name (verbose)', async () => {
-    sinon.stub(aadDevice, 'getDeviceByDisplayName').withArgs(deviceName).resolves({ id: deviceId, displayName: deviceName });
-    sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName });
+    sinon.stub(entraDevice, 'getDeviceByDisplayName').withArgs(deviceName).resolves({ id: deviceId, displayName: deviceName });
+    sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName });
 
     const postStub = sinon.stub(request, 'post').callsFake(async (opts) => {
       if (opts.url === `https://graph.microsoft.com/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/$ref`) {

diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-member-add.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-member-add.ts
@@ -1,13 +1,13 @@
 import GlobalOptions from "../../../../GlobalOptions.js";
 import { Logger } from "../../../../cli/Logger.js";
-import { aadAdministrativeUnit } from "../../../../utils/aadAdministrativeUnit.js";
-import { aadGroup } from "../../../../utils/aadGroup.js";
-import { aadUser } from "../../../../utils/aadUser.js";
+import { entraAdministrativeUnit } from "../../../../utils/entraAdministrativeUnit.js";
+import { entraGroup } from "../../../../utils/entraGroup.js";
+import { entraUser } from "../../../../utils/entraUser.js";
 import { validation } from "../../../../utils/validation.js";
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
 import request, { CliRequestOptions } from "../../../../request.js";
-import { aadDevice } from "../../../../utils/aadDevice.js";
+import { entraDevice } from "../../../../utils/entraDevice.js";
 import aadCommands from "../../aadCommands.js";
 
 interface CommandArgs {
@@ -129,7 +129,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
           await logger.logToStderr(`Retrieving Administrative Unit Id...`);
         }
 
-        administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id!;
+        administrativeUnitId = (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id!;
       }
 
       if (args.options.userId || args.options.userName) {
@@ -141,7 +141,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
             await logger.logToStderr(`Retrieving User Id...`);
           }
 
-          memberId = await aadUser.getUserIdByUpn(args.options.userName);
+          memberId = await entraUser.getUserIdByUpn(args.options.userName);
         }
       }
       else if (args.options.groupId || args.options.groupName) {
@@ -153,7 +153,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
             await logger.logToStderr(`Retrieving Group Id...`);
           }
 
-          memberId = await aadGroup.getGroupIdByDisplayName(args.options.groupName);
+          memberId = await entraGroup.getGroupIdByDisplayName(args.options.groupName);
         }
       }
       else if (args.options.deviceId || args.options.deviceName) {
@@ -165,7 +165,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
             await logger.logToStderr(`Device with name ${args.options.deviceName} retrieved, returned id: ${memberId}`);
           }
 
-          memberId = (await aadDevice.getDeviceByDisplayName(args.options.deviceName)).id;
+          memberId = (await entraDevice.getDeviceByDisplayName(args.options.deviceName)).id;
         }
       }
 

diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-member-get.spec.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-member-get.spec.ts
@@ -12,7 +12,7 @@ import command from './administrativeunit-member-get.js';
 import request from '../../../../request.js';
 import { sinonUtil } from '../../../../utils/sinonUtil.js';
 import { CommandError } from '../../../../Command.js';
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import { settingsNames } from '../../../../settingsNames.js';
 import aadCommands from '../../aadCommands.js';
 
@@ -71,7 +71,7 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_GET, () => {
   afterEach(() => {
     sinonUtil.restore([
       request.get,
-      aadAdministrativeUnit.getAdministrativeUnitByDisplayName,
+      entraAdministrativeUnit.getAdministrativeUnitByDisplayName,
       cli.getSettingWithDefaultValue
     ]);
   });
@@ -170,7 +170,7 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_GET, () => {
   });
 
   it('get member info for an administrative unit specified by name and member specified by id (verbose)', async () => {
-    sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName });
+    sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName });
 
     sinon.stub(request, 'get').callsFake(async (opts) => {
       if (opts.url === `https://graph.microsoft.com/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/${userId}`) {

diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-member-get.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-member-get.ts
@@ -4,7 +4,7 @@ import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { Logger } from '../../../../cli/Logger.js';
 import { validation } from '../../../../utils/validation.js';
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import request, { CliRequestOptions } from '../../../../request.js';
 import aadCommands from '../../aadCommands.js';
 
@@ -103,7 +103,7 @@ class EntraAdministrativeUnitMemberGetCommand extends GraphCommand {
           await logger.logToStderr(`Retrieving Administrative Unit Id...`);
         }
 
-        administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id!;
+        administrativeUnitId = (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id!;
       }
 
       const url = this.getRequestUrl(administrativeUnitId!, args.options.id, args.options);

diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-member-list.spec.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-member-list.spec.ts
@@ -13,7 +13,7 @@ import command from './administrativeunit-member-list.js';
 import { settingsNames } from '../../../../settingsNames.js';
 import { CommandInfo } from '../../../../cli/CommandInfo.js';
 import { cli } from '../../../../cli/cli.js';
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import aadCommands from '../../aadCommands.js';
 
 describe(commands.ADMINISTRATIVEUNIT_MEMBER_LIST, () => {
@@ -308,7 +308,7 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_LIST, () => {
   afterEach(() => {
     sinonUtil.restore([
       request.get,
-      aadAdministrativeUnit.getAdministrativeUnitByDisplayName,
+      entraAdministrativeUnit.getAdministrativeUnitByDisplayName,
       cli.getSettingWithDefaultValue
     ]);
   });
@@ -543,7 +543,7 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_LIST, () => {
   });
 
   it('should get all members of an administrative unit specified by its name when type not specified', async () => {
-    sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName });
+    sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName });
 
     sinon.stub(request, 'get').callsFake(async (opts) => {
       if (opts.url === `https://graph.microsoft.com/v1.0/directory/administrativeUnits/${administrativeUnitId}/members`) {

diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-member-list.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-member-list.ts
@@ -4,7 +4,7 @@ import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import GlobalOptions from '../../../../GlobalOptions.js';
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import { validation } from '../../../../utils/validation.js';
 import { CliRequestOptions } from '../../../../request.js';
 import aadCommands from '../../aadCommands.js';
@@ -114,7 +114,7 @@ class EntraAdministrativeUnitMemberListCommand extends GraphCommand {
 
     try {
       if (args.options.administrativeUnitName) {
-        administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+        administrativeUnitId = (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
       }
 
       let results;

diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-remove.spec.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-remove.spec.ts
@@ -12,7 +12,7 @@ import { sinonUtil } from '../../../../utils/sinonUtil.js';
 import { cli } from '../../../../cli/cli.js';
 import { CommandInfo } from '../../../../cli/CommandInfo.js';
 import command from './administrativeunit-remove.js';
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import aadCommands from '../../aadCommands.js';
 
 describe(commands.ADMINISTRATIVEUNIT_REMOVE, () => {
@@ -57,7 +57,7 @@ describe(commands.ADMINISTRATIVEUNIT_REMOVE, () => {
   afterEach(() => {
     sinonUtil.restore([
       request.delete,
-      aadAdministrativeUnit.getAdministrativeUnitByDisplayName,
+      entraAdministrativeUnit.getAdministrativeUnitByDisplayName,
       cli.handleMultipleResultsFound,
       cli.promptForConfirmation
     ]);
@@ -100,7 +100,7 @@ describe(commands.ADMINISTRATIVEUNIT_REMOVE, () => {
   });
 
   it('removes the specified administrative unit by displayName while prompting for confirmation', async () => {
-    sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').resolves({ id: administrativeUnitId, displayName: displayName });
+    sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').resolves({ id: administrativeUnitId, displayName: displayName });
 
     const deleteRequestStub = sinon.stub(request, 'delete').callsFake(async (opts) => {
       if (opts.url === `https://graph.microsoft.com/v1.0/directory/administrativeUnits/${administrativeUnitId}`) {

diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-remove.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-remove.ts
@@ -1,4 +1,4 @@
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import GlobalOptions from "../../../../GlobalOptions.js";
 import { Logger } from "../../../../cli/Logger.js";
 import { validation } from "../../../../utils/validation.js";
@@ -95,7 +95,7 @@ class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
         let administrativeUnitId = args.options.id;
 
         if (args.options.displayName) {
-          const administrativeUnit = await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName);
+          const administrativeUnit = await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName);
           administrativeUnitId = administrativeUnit.id;
         }