@pnp/cli-microsoft365 7.0.0-beta.7e7b4f8 → 7.0.0-beta.86298a0

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

@@ -48,8 +48,7 @@ class AadUserListCommand extends GraphCommand_1.default {
                 catch (ex) {
                     throw ex;
                 }
-                const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.user' : 'users';
-                const url = `${this.resource}/v1.0/${endpoint}?$select=${properties.join(',')}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
+                const url = `${this.resource}/v1.0/users?$select=${properties.join(',')}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
                 const users = yield odata_1.odata.getAllItems(url);
                 logger.log(users);
             }
@@ -63,7 +62,6 @@ class AadUserListCommand extends GraphCommand_1.default {
         const excludeOptions = [
             'properties',
             'p',
-            'deleted',
             'd',
             'debug',
             'verbose',
@@ -90,12 +88,11 @@ class AadUserListCommand extends GraphCommand_1.default {
 _AadUserListCommand_instances = new WeakSet(), _AadUserListCommand_initTelemetry = function _AadUserListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            properties: args.options.properties,
-            deleted: typeof args.options.deleted !== 'undefined'
+            properties: args.options.properties
         });
     });
 }, _AadUserListCommand_initOptions = function _AadUserListCommand_initOptions() {
-    this.options.unshift({ option: '-p, --properties [properties]' }, { option: '-d, --deleted' });
+    this.options.unshift({ option: '-p, --properties [properties]' });
 };
 module.exports = new AadUserListCommand();
 //# sourceMappingURL=user-list.js.map

package/dist/m365/aad/commands/user/user-set.js

@@ -45,21 +45,21 @@ class AadUserSetCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 if (args.options.currentPassword) {
-                    if (args.options.objectId && args.options.objectId !== accessToken_1.accessToken.getUserIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)) {
-                        throw `You can only change your own password. Please use --objectId @meId to reference to your own userId`;
+                    if (args.options.id && args.options.id !== accessToken_1.accessToken.getUserIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)) {
+                        throw `You can only change your own password. Please use --id @meId to reference to your own userId`;
                     }
-                    else if (args.options.userPrincipalName && args.options.userPrincipalName.toLowerCase() !== accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken).toLowerCase()) {
-                        throw 'You can only change your own password. Please use --userPrincipalName @meUserName to reference to your own user principal name';
+                    else if (args.options.userName && args.options.userName.toLowerCase() !== accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken).toLowerCase()) {
+                        throw 'You can only change your own password. Please use --userName @meUserName to reference to your own user principal name';
                     }
                 }
                 if (this.verbose) {
-                    logger.logToStderr(`Updating user ${args.options.userPrincipalName || args.options.objectId}`);
+                    logger.logToStderr(`Updating user ${args.options.userName || args.options.id}`);
                 }
-                const requestUrl = `${this.resource}/v1.0/users/${formatting_1.formatting.encodeQueryParameter(args.options.objectId ? args.options.objectId : args.options.userPrincipalName)}`;
+                const requestUrl = `${this.resource}/v1.0/users/${formatting_1.formatting.encodeQueryParameter(args.options.id ? args.options.id : args.options.userName)}`;
                 const manifest = this.mapRequestBody(args.options);
                 if (Object.keys(manifest).some(k => manifest[k] !== undefined)) {
                     if (this.verbose) {
-                        logger.logToStderr(`Setting the updated properties for user ${args.options.userPrincipalName || args.options.objectId}`);
+                        logger.logToStderr(`Setting the updated properties for user ${args.options.userName || args.options.id}`);
                     }
                     const requestOptions = {
                         url: requestUrl,
@@ -84,7 +84,7 @@ class AadUserSetCommand extends GraphCommand_1.default {
                     if (this.verbose) {
                         logger.logToStderr('Removing the manager');
                     }
-                    const user = args.options.objectId || args.options.userPrincipalName;
+                    const user = args.options.id || args.options.userName;
                     yield this.removeManager(user);
                 }
             }
@@ -125,7 +125,7 @@ class AadUserSetCommand extends GraphCommand_1.default {
     changePassword(requestUrl, options, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Changing password for user ${options.userPrincipalName || options.objectId}`);
+                logger.logToStderr(`Changing password for user ${options.userName || options.id}`);
             }
             const requestBody = {
                 currentPassword: options.currentPassword,
@@ -145,7 +145,7 @@ class AadUserSetCommand extends GraphCommand_1.default {
     updateManager(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const managerRequestOptions = {
-                url: `${this.resource}/v1.0/users/${options.objectId || options.userPrincipalName}/manager/$ref`,
+                url: `${this.resource}/v1.0/users/${options.id || options.userName}/manager/$ref`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -171,8 +171,8 @@ class AadUserSetCommand extends GraphCommand_1.default {
 _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry = function _AadUserSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            objectId: typeof args.options.objectId !== 'undefined',
-            userPrincipalName: typeof args.options.userPrincipalName !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
             accountEnabled: !!args.options.accountEnabled,
             resetPassword: !!args.options.resetPassword,
             forceChangePasswordNextSignIn: !!args.options.forceChangePasswordNextSignIn,
@@ -195,9 +195,9 @@ _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry =
     });
 }, _AadUserSetCommand_initOptions = function _AadUserSetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --objectId [objectId]'
+        option: '-i, --id [id]'
     }, {
-        option: '-n, --userPrincipalName [userPrincipalName]'
+        option: '-n, --userName [userName]'
     }, {
         option: '--accountEnabled [accountEnabled]',
         autocomplete: ['true', 'false']
@@ -240,12 +240,12 @@ _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry =
     this.types.boolean.push('accountEnabled');
 }, _AadUserSetCommand_initValidators = function _AadUserSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.objectId &&
-            !validation_1.validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid GUID`;
+        if (args.options.id &&
+            !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
-        if (args.options.userPrincipalName && !validation_1.validation.isValidUserPrincipalName(args.options.userPrincipalName)) {
-            return `${args.options.userPrincipalName} is not a valid userPrincipalName`;
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
         }
         if (!args.options.resetPassword && ((args.options.currentPassword && !args.options.newPassword) || (args.options.newPassword && !args.options.currentPassword))) {
             return `Specify both currentPassword and newPassword when you want to change your password`;
@@ -296,7 +296,7 @@ _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry =
     }));
 }, _AadUserSetCommand_initOptionSets = function _AadUserSetCommand_initOptionSets() {
     this.optionSets.push({
-        options: ['objectId', 'userPrincipalName']
+        options: ['id', 'userName']
     }, {
         options: ['managerUserId', 'managerUserName', 'removeManager'],
         runsWhen: (args) => args.options.managerUserId || args.options.managerUserName || args.options.removeManager

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

@@ -57,11 +57,13 @@ class FlowEnvironmentGetCommand extends AzmgmtCommand_1.default {
             };
             try {
                 const flowItem = yield request_1.default.get(requestOptions);
-                flowItem.displayName = flowItem.properties.displayName;
-                flowItem.provisioningState = flowItem.properties.provisioningState;
-                flowItem.environmentSku = flowItem.properties.environmentSku;
-                flowItem.azureRegionHint = flowItem.properties.azureRegionHint;
-                flowItem.isDefault = flowItem.properties.isDefault;
+                if (args.options.output !== 'json') {
+                    flowItem.displayName = flowItem.properties.displayName;
+                    flowItem.provisioningState = flowItem.properties.provisioningState;
+                    flowItem.environmentSku = flowItem.properties.environmentSku;
+                    flowItem.azureRegionHint = flowItem.properties.azureRegionHint;
+                    flowItem.isDefault = flowItem.properties.isDefault;
+                }
                 logger.log(flowItem);
             }
             catch (err) {

package/dist/m365/flow/commands/environment/environment-list.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
 const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowEnvironmentListCommand extends AzmgmtCommand_1.default {
@@ -22,26 +22,19 @@ class FlowEnvironmentListCommand extends AzmgmtCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    commandAction(logger) {
+    commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving list of Microsoft Flow environments...`);
             }
-            const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/environments?api-version=2016-11-01`,
-                headers: {
-                    accept: 'application/json'
-                },
-                responseType: 'json'
-            };
             try {
-                const res = yield request_1.default.get(requestOptions);
-                if (res.value && res.value.length > 0) {
-                    res.value.forEach(e => {
+                const res = yield odata_1.odata.getAllItems(`${this.resource}providers/Microsoft.ProcessSimple/environments?api-version=2016-11-01`);
+                if (args.options.output !== 'json' && res.length > 0) {
+                    res.forEach(e => {
                         e.displayName = e.properties.displayName;
                     });
-                    logger.log(res.value);
                 }
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

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

@@ -49,18 +49,13 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
             }
             try {
                 yield this.getAllItems(url, logger, true);
-                if (this.items.length > 0) {
+                if (args.options.output !== 'json' && this.items.length > 0) {
                     this.items.forEach(i => {
                         i.startTime = i.properties.startTime;
                         i.status = i.properties.status;
                     });
-                    logger.log(this.items);
-                }
-                else {
-                    if (this.verbose) {
-                        logger.logToStderr('No runs found');
-                    }
                 }
+                logger.log(this.items);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

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

@@ -58,7 +58,7 @@ class PaAppConsentSetCommand extends PowerAppsCommand_1.default {
     consentPaApp(args) {
         return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.PowerApps/scopes/admin/environments/${args.options.environment}/apps/${args.options.name}/setPowerAppConnectionDirectConsentBypass?api-version=2021-02-01`,
+                url: `${this.resource}/providers/Microsoft.PowerApps/scopes/admin/environments/${args.options.environmentName}/apps/${args.options.name}/setPowerAppConnectionDirectConsentBypass?api-version=2021-02-01`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -78,7 +78,7 @@ class PaAppConsentSetCommand extends PowerAppsCommand_1.default {
 }
 _PaAppConsentSetCommand_instances = new WeakSet(), _PaAppConsentSetCommand_initOptions = function _PaAppConsentSetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-n, --name <name>'
     }, {

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

@@ -77,7 +77,7 @@ class PaAppExportCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr('Getting the Microsoft Power App resources...');
             }
             const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environment)}/listPackageResources?api-version=2016-11-01`,
+                url: `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/listPackageResources?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -102,7 +102,7 @@ class PaAppExportCommand extends PowerPlatformCommand_1.default {
             }
             const resources = yield this.getPackageResources(args, logger);
             const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environment)}/exportPackage?api-version=2016-11-01`,
+                url: `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/exportPackage?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -169,7 +169,7 @@ _PaAppExportCommand_instances = new WeakSet(), _PaAppExportCommand_initTelemetry
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-n, --packageDisplayName [packageDisplayName]'
     }, {

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

@@ -38,7 +38,7 @@ class PaAppListCommand extends PowerAppsCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environment ? '/environments/' + formatting_1.formatting.encodeQueryParameter(args.options.environment) : ''}/apps?api-version=2017-08-01`;
+            const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environmentName ? '/environments/' + formatting_1.formatting.encodeQueryParameter(args.options.environmentName) : ''}/apps?api-version=2017-08-01`;
             try {
                 const apps = yield odata_1.odata.getAllItems(url);
                 if (apps.length > 0) {
@@ -63,21 +63,21 @@ _PaAppListCommand_instances = new WeakSet(), _PaAppListCommand_initTelemetry = f
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             asAdmin: args.options.asAdmin === true,
-            environment: typeof args.options.environment !== 'undefined'
+            environmentName: typeof args.options.environmentName !== 'undefined'
         });
     });
 }, _PaAppListCommand_initOptions = function _PaAppListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment [environment]'
+        option: '-e, --environmentName [environmentName]'
     }, {
         option: '--asAdmin'
     });
 }, _PaAppListCommand_initValidators = function _PaAppListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.asAdmin && !args.options.environment) {
+        if (args.options.asAdmin && !args.options.environmentName) {
             return 'When specifying the asAdmin option the environment option is required as well';
         }
-        if (args.options.environment && !args.options.asAdmin) {
+        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/roster/roster-member-add.js

@@ -19,8 +19,7 @@ const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const AadUserGetCommand = require("../../../aad/commands/user/user-get");
-const Cli_1 = require("../../../../cli/Cli");
+const aadUser_1 = require("../../../../utils/aadUser");
 class PlannerRosterMemberAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.ROSTER_MEMBER_ADD;
@@ -69,18 +68,8 @@ class PlannerRosterMemberAddCommand extends GraphCommand_1.default {
             if (args.options.userId) {
                 return args.options.userId;
             }
-            const aadUserGetCommandoptions = {
-                userName: args.options.userName,
-                output: 'json',
-                debug: args.options.debug,
-                verbose: args.options.verbose
-            };
-            const aadUserGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, aadUserGetCommandoptions), { _: [] }) });
-            if (this.verbose) {
-                logger.logToStderr(aadUserGetOutput.stderr);
-            }
-            const aadUserGetJsonOutput = JSON.parse(aadUserGetOutput.stdout);
-            return aadUserGetJsonOutput.id;
+            const userId = yield aadUser_1.aadUser.getUserIdByUpn(args.options.userName);
+            return userId;
         });
     }
 }

package/dist/m365/pp/commands/aibuildermodel/aibuildermodel-get.js

@@ -44,7 +44,7 @@ class PpAiBuilderModelGetCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving an AI builder model '${args.options.id || args.options.name}'...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const res = yield this.getAiBuilderModel(dynamicsApiUrl, args.options);
                 logger.log(res);
             }
@@ -88,7 +88,7 @@ _PpAiBuilderModelGetCommand_instances = new WeakSet(), _PpAiBuilderModelGetComma
     });
 }, _PpAiBuilderModelGetCommand_initOptions = function _PpAiBuilderModelGetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/aibuildermodel/aibuildermodel-list.js

@@ -41,7 +41,7 @@ class PpAiBuilderModelListCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving available AI Builder models`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const aimodels = yield odata_1.odata.getAllItems(`${dynamicsApiUrl}/api/data/v9.0/msdyn_aimodels?$filter=iscustomizable/Value eq true`);
                 logger.log(aimodels);
             }
@@ -59,7 +59,7 @@ _PpAiBuilderModelListCommand_instances = new WeakSet(), _PpAiBuilderModelListCom
     });
 }, _PpAiBuilderModelListCommand_initOptions = function _PpAiBuilderModelListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/pp/commands/aibuildermodel/aibuildermodel-remove.js

@@ -64,7 +64,7 @@ class PpAiBuilderModelRemoveCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -78,7 +78,7 @@ class PpAiBuilderModelRemoveCommand extends PowerPlatformCommand_1.default {
     deleteAiBuilderModel(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const aiBuilderModelId = yield this.getAiBuilderModelId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/msdyn_aimodels(${aiBuilderModelId})`,
@@ -106,7 +106,7 @@ _PpAiBuilderModelRemoveCommand_instances = new WeakSet(), _PpAiBuilderModelRemov
     });
 }, _PpAiBuilderModelRemoveCommand_initOptions = function _PpAiBuilderModelRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/card/card-clone.js

@@ -52,7 +52,7 @@ class PpCardCloneCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -66,7 +66,7 @@ class PpCardCloneCommand extends PowerPlatformCommand_1.default {
     cloneCard(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const cardId = yield this.getCardId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/CardCreateClone`,
@@ -98,7 +98,7 @@ _PpCardCloneCommand_instances = new WeakSet(), _PpCardCloneCommand_initTelemetry
     });
 }, _PpCardCloneCommand_initOptions = function _PpCardCloneCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--newName <newName>'
     }, {

package/dist/m365/pp/commands/card/card-get.js

@@ -45,7 +45,7 @@ class PpCardGetCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving a card '${args.options.id || args.options.name}'...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const res = yield this.getCard(dynamicsApiUrl, args.options);
                 logger.log(res);
             }
@@ -93,7 +93,7 @@ _PpCardGetCommand_instances = new WeakSet(), _PpCardGetCommand_initTelemetry = f
     });
 }, _PpCardGetCommand_initOptions = function _PpCardGetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/card/card-list.js

@@ -41,7 +41,7 @@ class PpCardListCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving list of cards`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const items = yield odata_1.odata.getAllItems(`${dynamicsApiUrl}/api/data/v9.1/cards?$expand=owninguser($select=azureactivedirectoryobjectid,fullname)`);
                 logger.log(items);
             }
@@ -59,7 +59,7 @@ _PpCardListCommand_instances = new WeakSet(), _PpCardListCommand_initTelemetry =
     });
 }, _PpCardListCommand_initOptions = function _PpCardListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/pp/commands/card/card-remove.js

@@ -64,7 +64,7 @@ class PpCardRemoveCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -78,7 +78,7 @@ class PpCardRemoveCommand extends PowerPlatformCommand_1.default {
     deleteCard(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const cardId = yield this.getCardId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/cards(${cardId})`,
@@ -106,7 +106,7 @@ _PpCardRemoveCommand_instances = new WeakSet(), _PpCardRemoveCommand_initTelemet
     });
 }, _PpCardRemoveCommand_initOptions = function _PpCardRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/chatbot/chatbot-get.js

@@ -45,7 +45,7 @@ class PpChatbotGetCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving chatbot '${args.options.id || args.options.name}'...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const res = yield this.getChatbot(dynamicsApiUrl, args.options);
                 logger.log(res);
             }
@@ -89,7 +89,7 @@ _PpChatbotGetCommand_instances = new WeakSet(), _PpChatbotGetCommand_initTelemet
     });
 }, _PpChatbotGetCommand_initOptions = function _PpChatbotGetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/chatbot/chatbot-list.js

@@ -38,7 +38,7 @@ class PpChatbotListCommand extends PowerPlatformCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving list of chatbots for environment '${args.options.environment}'.`);
+                logger.logToStderr(`Retrieving list of chatbots for environment '${args.options.environmentName}'.`);
             }
             const fetchXml = `
       <fetch mapping='logical' version='1.0' >
@@ -81,7 +81,7 @@ class PpChatbotListCommand extends PowerPlatformCommand_1.default {
       </fetch>
     `;
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const items = yield odata_1.odata.getAllItems(`${dynamicsApiUrl}/api/data/v9.1/bots?fetchXml=${fetchXml}`);
                 logger.log(items);
             }
@@ -99,7 +99,7 @@ _PpChatbotListCommand_instances = new WeakSet(), _PpChatbotListCommand_initTelem
     });
 }, _PpChatbotListCommand_initOptions = function _PpChatbotListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/pp/commands/chatbot/chatbot-remove.js

@@ -64,7 +64,7 @@ class PpChatbotRemoveCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -78,7 +78,7 @@ class PpChatbotRemoveCommand extends PowerPlatformCommand_1.default {
     deleteChatbot(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const botId = yield this.getChatbotId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/bots(${botId})/Microsoft.Dynamics.CRM.PvaDeleteBot?tag=deprovisionbotondelete`,
@@ -107,7 +107,7 @@ _PpChatbotRemoveCommand_instances = new WeakSet(), _PpChatbotRemoveCommand_initT
     });
 }, _PpChatbotRemoveCommand_initOptions = function _PpChatbotRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/dataverse/dataverse-table-get.js

@@ -41,7 +41,7 @@ class PpDataverseTableGetCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving a table for which the user is an admin...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.0/EntityDefinitions(LogicalName='${args.options.name}')?$select=MetadataId,IsCustomEntity,IsManaged,SchemaName,IconVectorName,LogicalName,EntitySetName,IsActivity,DataProviderId,IsRenameable,IsCustomizable,CanCreateForms,CanCreateViews,CanCreateCharts,CanCreateAttributes,CanChangeTrackingBeEnabled,CanModifyAdditionalSettings,CanChangeHierarchicalRelationship,CanEnableSyncToExternalSearchIndex&api-version=9.1`,
                     headers: {
@@ -66,7 +66,7 @@ _PpDataverseTableGetCommand_instances = new WeakSet(), _PpDataverseTableGetComma
     });
 }, _PpDataverseTableGetCommand_initOptions = function _PpDataverseTableGetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-n, --name <name>'
     }, {

package/dist/m365/pp/commands/dataverse/dataverse-table-list.js

@@ -41,7 +41,7 @@ class PpDataverseTableListCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving list of tables for which the user is an admin...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const endpoint = `${dynamicsApiUrl}/api/data/v9.0/EntityDefinitions?$select=MetadataId,IsCustomEntity,IsManaged,SchemaName,IconVectorName,LogicalName,EntitySetName,IsActivity,DataProviderId,IsRenameable,IsCustomizable,CanCreateForms,CanCreateViews,CanCreateCharts,CanCreateAttributes,CanChangeTrackingBeEnabled,CanModifyAdditionalSettings,CanChangeHierarchicalRelationship,CanEnableSyncToExternalSearchIndex&$filter=(IsIntersect eq false and IsLogicalEntity eq false and%0APrimaryNameAttribute ne null and PrimaryNameAttribute ne %27%27 and ObjectTypeCode gt 0 and%0AObjectTypeCode ne 4712 and ObjectTypeCode ne 4724 and ObjectTypeCode ne 9933 and ObjectTypeCode ne 9934 and%0AObjectTypeCode ne 9935 and ObjectTypeCode ne 9947 and ObjectTypeCode ne 9945 and ObjectTypeCode ne 9944 and%0AObjectTypeCode ne 9942 and ObjectTypeCode ne 9951 and ObjectTypeCode ne 2016 and ObjectTypeCode ne 9949 and%0AObjectTypeCode ne 9866 and ObjectTypeCode ne 9867 and ObjectTypeCode ne 9868) and (IsCustomizable/Value eq true or IsCustomEntity eq true or IsManaged eq false or IsMappable/Value eq true or IsRenameable/Value eq true)&api-version=9.1`;
                 const res = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(res);
@@ -60,7 +60,7 @@ _PpDataverseTableListCommand_instances = new WeakSet(), _PpDataverseTableListCom
     });
 }, _PpDataverseTableListCommand_initOptions = function _PpDataverseTableListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/pp/commands/dataverse/dataverse-table-remove.js

@@ -57,7 +57,7 @@ class PpDataverseTableRemoveCommand extends PowerPlatformCommand_1.default {
     removeDataverseTable(options) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(options.environment, options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(options.environmentName, options.asAdmin);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.0/EntityDefinitions(LogicalName='${options.name}')`,
                     headers: {
@@ -82,7 +82,7 @@ _PpDataverseTableRemoveCommand_instances = new WeakSet(), _PpDataverseTableRemov
     });
 }, _PpDataverseTableRemoveCommand_initOptions = function _PpDataverseTableRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-n, --name <name>'
     }, {