@pnp/cli-microsoft365 5.9.0-beta.fd6d022 → 6.0.0-beta.01ba480

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

@@ -35,12 +35,12 @@ class AadSpGetCommand extends GraphCommand_1.default {
         return 'Gets information about the specific service principal';
     }
     getSpId(args) {
-        if (args.options.objectId) {
-            return Promise.resolve(args.options.objectId);
+        if (args.options.appObjectId) {
+            return Promise.resolve(args.options.appObjectId);
         }
         let spMatchQuery = '';
-        if (args.options.displayName) {
-            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.displayName)}'`;
+        if (args.options.appDisplayName) {
+            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
         }
         else if (args.options.appId) {
             spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
@@ -60,7 +60,7 @@ class AadSpGetCommand extends GraphCommand_1.default {
                 return Promise.reject(`The specified Azure AD app does not exist`);
             }
             if (response.value.length > 1) {
-                return Promise.reject(`Multiple Azure AD apps with name ${args.options.displayName} found: ${response.value.map(x => x.id)}`);
+                return Promise.reject(`Multiple Azure AD apps with name ${args.options.appDisplayName} found: ${response.value.map(x => x.id)}`);
             }
             return Promise.resolve(spItem.id);
         });
@@ -93,30 +93,30 @@ _AadSpGetCommand_instances = new WeakSet(), _AadSpGetCommand_initTelemetry = fun
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: (!(!args.options.appId)).toString(),
-            displayName: (!(!args.options.displayName)).toString(),
-            objectId: (!(!args.options.objectId)).toString()
+            appDisplayName: (!(!args.options.appDisplayName)).toString(),
+            appObjectId: (!(!args.options.appObjectId)).toString()
         });
     });
 }, _AadSpGetCommand_initOptions = function _AadSpGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --appId [appId]'
     }, {
-        option: '-n, --displayName [displayName]'
+        option: '-n, --appDisplayName [appDisplayName]'
     }, {
-        option: '--objectId [objectId]'
+        option: '--appObjectId [appObjectId]'
     });
 }, _AadSpGetCommand_initValidators = function _AadSpGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
-        if (args.options.objectId && !validation_1.validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid objectId GUID`;
+        if (args.options.appObjectId && !validation_1.validation.isValidGuid(args.options.appObjectId)) {
+            return `${args.options.appObjectId} is not a valid objectId GUID`;
         }
         return true;
     }));
 }, _AadSpGetCommand_initOptionSets = function _AadSpGetCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'displayName', 'objectId']);
+    this.optionSets.push(['appId', 'appDisplayName', 'appObjectId']);
 };
 module.exports = new AadSpGetCommand();
 //# sourceMappingURL=sp-get.js.map

package/dist/m365/aad/commands/user/user-guest-add.js

@@ -0,0 +1,103 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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 _AadUserGuestAddCommand_instances, _AadUserGuestAddCommand_initTelemetry, _AadUserGuestAddCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadUserGuestAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadUserGuestAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserGuestAddCommand_instances, "m", _AadUserGuestAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserGuestAddCommand_instances, "m", _AadUserGuestAddCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands_1.default.USER_GUEST_ADD;
+    }
+    get description() {
+        return 'Invite an external user to the organization';
+    }
+    defaultProperties() {
+        return ['id', 'inviteRedeemUrl', 'invitedUserDisplayName', 'invitedUserEmailAddress', 'invitedUserType', 'resetRedemption', 'sendInvitationMessage', 'status'];
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/invitations`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        invitedUserEmailAddress: args.options.emailAddress,
+                        inviteRedirectUrl: args.options.inviteRedirectUrl || 'https://myapplications.microsoft.com',
+                        invitedUserDisplayName: args.options.displayName,
+                        sendInvitationMessage: args.options.sendInvitationMessage,
+                        invitedUserMessageInfo: {
+                            customizedMessageBody: args.options.welcomeMessage,
+                            messageLanguage: args.options.messageLanguage || 'en-US',
+                            ccRecipients: args.options.ccRecipients ? this.mapEmailsToRecipients([args.options.ccRecipients]) : undefined
+                        }
+                    }
+                };
+                const result = yield request_1.default.post(requestOptions);
+                logger.log(result);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    mapEmailsToRecipients(emails) {
+        return emails.map(mail => ({
+            emailAddress: {
+                address: mail.trim()
+            }
+        }));
+    }
+}
+_AadUserGuestAddCommand_instances = new WeakSet(), _AadUserGuestAddCommand_initTelemetry = function _AadUserGuestAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            displayName: typeof args.options.displayName !== 'undefined',
+            inviteRedirectUrl: typeof args.options.inviteRedirectUrl !== 'undefined',
+            welcomeMessage: typeof args.options.welcomeMessage !== 'undefined',
+            messageLanguage: typeof args.options.messageLanguage !== 'undefined',
+            ccRecipients: typeof args.options.ccRecipients !== 'undefined',
+            sendInvitationMessage: !!args.options.sendInvitationMessage
+        });
+    });
+}, _AadUserGuestAddCommand_initOptions = function _AadUserGuestAddCommand_initOptions() {
+    this.options.unshift({
+        option: '--emailAddress <emailAddress>'
+    }, {
+        option: '--displayName [displayName]'
+    }, {
+        option: '--inviteRedirectUrl [inviteRedirectUrl]'
+    }, {
+        option: '--welcomeMessage [welcomeMessage]'
+    }, {
+        option: '--messageLanguage [messageLanguage]'
+    }, {
+        option: '--ccRecipients [ccRecipients]'
+    }, {
+        option: '--sendInvitationMessage'
+    });
+};
+module.exports = new AadUserGuestAddCommand();
+//# sourceMappingURL=user-guest-add.js.map

package/dist/m365/aad/commands.js

@@ -3,11 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'aad';
 exports.default = {
     APP_ADD: `${prefix} app add`,
-    APP_DELETE: `${prefix} app delete`,
     APP_GET: `${prefix} app get`,
     APP_REMOVE: `${prefix} app remove`,
     APP_ROLE_ADD: `${prefix} app role add`,
-    APP_ROLE_DELETE: `${prefix} app role delete`,
     APP_ROLE_LIST: `${prefix} app role list`,
     APP_ROLE_REMOVE: `${prefix} app role remove`,
     APP_SET: `${prefix} app set`,
@@ -40,7 +38,6 @@ exports.default = {
     O365GROUP_REPORT_ACTIVITYFILECOUNTS: `${prefix} o365group report activityfilecounts`,
     O365GROUP_REPORT_ACTIVITYGROUPCOUNTS: `${prefix} o365group report activitygroupcounts`,
     O365GROUP_REPORT_ACTIVITYSTORAGE: `${prefix} o365group report activitystorage`,
-    O365GROUP_RESTORE: `${prefix} o365group restore`,
     O365GROUP_USER_ADD: `${prefix} o365group user add`,
     O365GROUP_USER_LIST: `${prefix} o365group user list`,
     O365GROUP_USER_REMOVE: `${prefix} o365group user remove`,
@@ -57,6 +54,7 @@ exports.default = {
     SP_ADD: `${prefix} sp add`,
     SP_GET: `${prefix} sp get`,
     USER_GET: `${prefix} user get`,
+    USER_GUEST_ADD: `${prefix} user guest add`,
     USER_HIBP: `${prefix} user hibp`,
     USER_LIST: `${prefix} user list`,
     USER_PASSWORD_VALIDATE: `${prefix} user password validate`,

package/dist/m365/cli/commands/config/config-set.js

@@ -37,7 +37,6 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let value = undefined;
             switch (args.options.key) {
-                case settingsNames_1.settingsNames.autoOpenBrowserOnLogin:
                 case settingsNames_1.settingsNames.autoOpenLinksInBrowser:
                 case settingsNames_1.settingsNames.copyDeviceCodeToClipboard:
                 case settingsNames_1.settingsNames.csvHeader:

package/dist/m365/commands/status.js

@@ -37,12 +37,17 @@ class StatusCommand extends Command_1.default {
                     logger.logToStderr({
                         connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
                         authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        appId: Auth_1.default.service.appId,
+                        appTenant: Auth_1.default.service.tenant,
                         accessTokens: JSON.stringify(Auth_1.default.service.accessTokens, null, 2)
                     });
                 }
                 else {
                     logger.log({
-                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)
+                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                        authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        appId: Auth_1.default.service.appId,
+                        appTenant: Auth_1.default.service.tenant
                     });
                 }
             }

package/dist/m365/flow/commands/flow-disable.js

@@ -36,7 +36,7 @@ class FlowDisableCommand extends AzmgmtCommand_1.default {
                 logger.logToStderr(`Disables Microsoft Flow ${args.options.name}...`);
             }
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.name)}/stop?api-version=2016-11-01`,
+                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.name)}/stop?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -55,7 +55,7 @@ _FlowDisableCommand_instances = new WeakSet(), _FlowDisableCommand_initOptions =
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/flow/commands/flow-enable.js

@@ -36,7 +36,7 @@ class FlowEnableCommand extends AzmgmtCommand_1.default {
                 logger.logToStderr(`Enables Microsoft Flow ${args.options.name}...`);
             }
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.name)}/start?api-version=2016-11-01`,
+                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.name)}/start?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -55,7 +55,7 @@ _FlowEnableCommand_instances = new WeakSet(), _FlowEnableCommand_initOptions = f
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/flow/commands/flow-export.js

@@ -51,7 +51,7 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
                 }
                 else {
                     const requestOptions = {
-                        url: `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environment)}/listPackageResources?api-version=2016-11-01`,
+                        url: `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environmentName)}/listPackageResources?api-version=2016-11-01`,
                         headers: {
                             accept: 'application/json'
                         },
@@ -72,8 +72,8 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
                 }
                 let requestOptions = {
                     url: formatArgument === 'json' ?
-                        `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.id)}?api-version=2016-11-01`
-                        : `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environment)}/exportPackage?api-version=2016-11-01`,
+                        `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.id)}?api-version=2016-11-01`
+                        : `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environmentName)}/exportPackage?api-version=2016-11-01`,
                     headers: {
                         accept: 'application/json'
                     },
@@ -116,7 +116,7 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
                 }
                 requestOptions = {
                     url: formatArgument === 'json' ?
-                        `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.id)}/exportToARMTemplate?api-version=2016-11-01`
+                        `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.id)}/exportToARMTemplate?api-version=2016-11-01`
                         : downloadFileUrl,
                     // Set responseType to arraybuffer, otherwise binary data will be encoded
                     // to utf8 and binary data is corrupt
@@ -163,7 +163,7 @@ _FlowExportCommand_instances = new WeakSet(), _FlowExportCommand_initTelemetry =
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-n, --packageDisplayName [packageDisplayName]'
     }, {

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

@@ -39,7 +39,7 @@ class FlowGetCommand extends AzmgmtCommand_1.default {
                 logger.logToStderr(`Retrieving information about Microsoft Flow ${args.options.name}...`);
             }
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -63,7 +63,7 @@ _FlowGetCommand_instances = new WeakSet(), _FlowGetCommand_initOptions = functio
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

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

@@ -35,7 +35,7 @@ class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const url = `${this.resource}providers/Microsoft.ProcessSimple${args.options.asAdmin ? '/scopes/admin' : ''}/environments/${encodeURIComponent(args.options.environment)}/flows?api-version=2016-11-01`;
+            const url = `${this.resource}providers/Microsoft.ProcessSimple${args.options.asAdmin ? '/scopes/admin' : ''}/environments/${encodeURIComponent(args.options.environmentName)}/flows?api-version=2016-11-01`;
             try {
                 yield this.getAllItems(url, logger, true);
                 if (this.items.length > 0) {
@@ -64,7 +64,7 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
     });
 }, _FlowListCommand_initOptions = function _FlowListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

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

@@ -42,7 +42,7 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
             }
             const removeFlow = () => __awaiter(this, void 0, void 0, function* () {
                 const requestOptions = {
-                    url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                    url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
                     resolveWithFullResponse: true,
                     headers: {
                         accept: 'application/json'
@@ -54,7 +54,7 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
                     // handle 204 and throw error message to cmd when invalid flow id is passed
                     // https://github.com/pnp/cli-microsoft365/issues/1063#issuecomment-537218957
                     if (rawRes.statusCode === 204) {
-                        logger.log(chalk.red(`Error: Resource '${args.options.name}' does not exist in environment '${args.options.environment}'`));
+                        logger.log(chalk.red(`Error: Resource '${args.options.name}' does not exist in environment '${args.options.environmentName}'`));
                     }
                 }
                 catch (err) {
@@ -89,7 +89,7 @@ _FlowRemoveCommand_instances = new WeakSet(), _FlowRemoveCommand_initTelemetry =
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     }, {

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

@@ -36,11 +36,11 @@ class FlowRunCancelCommand extends AzmgmtCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.log(`Cancelling run ${args.options.name} of Microsoft Flow ${args.options.flow}...`);
+                logger.log(`Cancelling run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
             }
             const cancelFlow = () => __awaiter(this, void 0, void 0, function* () {
                 const requestOptions = {
-                    url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.flow)}/runs/${encodeURIComponent(args.options.name)}/cancel?api-version=2016-11-01`,
+                    url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.flowName)}/runs/${encodeURIComponent(args.options.name)}/cancel?api-version=2016-11-01`,
                     headers: {
                         accept: 'application/json'
                     },
@@ -74,16 +74,16 @@ _FlowRunCancelCommand_instances = new WeakSet(), _FlowRunCancelCommand_initOptio
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-f, --flow <flow>'
+        option: '-f, --flowName <flowName>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--confirm'
     });
 }, _FlowRunCancelCommand_initValidators = function _FlowRunCancelCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!validation_1.validation.isValidGuid(args.options.flow)) {
-            return `${args.options.flow} is not a valid GUID`;
+        if (!validation_1.validation.isValidGuid(args.options.flowName)) {
+            return `${args.options.flowName} is not a valid GUID`;
         }
         return true;
     }));

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

@@ -36,10 +36,10 @@ class FlowRunGetCommand extends AzmgmtCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving information about run ${args.options.name} of Microsoft Flow ${args.options.flow}...`);
+                logger.logToStderr(`Retrieving information about run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
             }
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.flow)}/runs/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.flowName)}/runs/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -63,9 +63,9 @@ _FlowRunGetCommand_instances = new WeakSet(), _FlowRunGetCommand_initOptions = f
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-f, --flow <flow>'
+        option: '-f, --flowName <flowName>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     });
 };
 module.exports = new FlowRunGetCommand();

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

@@ -35,9 +35,9 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flow}...`);
+                logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flowName}...`);
             }
-            const url = `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.flow)}/runs?api-version=2016-11-01`;
+            const url = `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.flowName)}/runs?api-version=2016-11-01`;
             try {
                 yield this.getAllItems(url, logger, true);
                 if (this.items.length > 0) {
@@ -61,9 +61,9 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
 }
 _FlowRunListCommand_instances = new WeakSet(), _FlowRunListCommand_initOptions = function _FlowRunListCommand_initOptions() {
     this.options.unshift({
-        option: '-f, --flow <flow>'
+        option: '-f, --flowName <flowName>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     });
 };
 module.exports = new FlowRunListCommand();

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

@@ -38,16 +38,16 @@ class FlowRunResubmitCommand extends AzmgmtCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Resubmitting run ${args.options.name} of Microsoft Flow ${args.options.flow}...`);
+                logger.logToStderr(`Resubmitting run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
             }
             const resubmitFlow = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const triggerName = yield this.getTriggerName(args.options.environment, args.options.flow);
+                    const triggerName = yield this.getTriggerName(args.options.environmentName, args.options.flowName);
                     if (this.debug) {
                         logger.logToStderr(chalk.yellow(`Retrieved trigger: ${triggerName}`));
                     }
                     const requestOptions = {
-                        url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.flow)}/triggers/${encodeURIComponent(triggerName)}/histories/${encodeURIComponent(args.options.name)}/resubmit?api-version=2016-11-01`,
+                        url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.flowName)}/triggers/${encodeURIComponent(triggerName)}/histories/${encodeURIComponent(args.options.name)}/resubmit?api-version=2016-11-01`,
                         headers: {
                             accept: 'application/json'
                         },
@@ -98,16 +98,16 @@ _FlowRunResubmitCommand_instances = new WeakSet(), _FlowRunResubmitCommand_initT
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-f, --flow <flow>'
+        option: '-f, --flowName <flowName>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--confirm'
     });
 }, _FlowRunResubmitCommand_initValidators = function _FlowRunResubmitCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!validation_1.validation.isValidGuid(args.options.flow)) {
-            return `${args.options.flow} is not a valid GUID`;
+        if (!validation_1.validation.isValidGuid(args.options.flowName)) {
+            return `${args.options.flowName} is not a valid GUID`;
         }
         return true;
     }));