@pnp/cli-microsoft365 6.0.0-beta.d4d33ed → 6.0.0-beta.dee678a

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

@@ -1,4 +1,19 @@
 "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 _FlowExportCommand_instances, _FlowExportCommand_initTelemetry, _FlowExportCommand_initOptions, _FlowExportCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -7,22 +22,19 @@ const utils_1 = require("../../../utils");
 const AzmgmtCommand_1 = require("../../base/AzmgmtCommand");
 const commands_1 = require("../commands");
 class FlowExportCommand extends AzmgmtCommand_1.default {
+    constructor() {
+        super();
+        _FlowExportCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowExportCommand_instances, "m", _FlowExportCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _FlowExportCommand_instances, "m", _FlowExportCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowExportCommand_instances, "m", _FlowExportCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.EXPORT;
     }
     get description() {
         return 'Exports the specified Microsoft Flow as a file';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.packageDisplayName = typeof args.options.packageDisplayName !== 'undefined';
-        telemetryProps.packageDescription = typeof args.options.packageDescription !== 'undefined';
-        telemetryProps.packageCreatedBy = typeof args.options.packageCreatedBy !== 'undefined';
-        telemetryProps.packageSourceEnvironment = typeof args.options.packageSourceEnvironment !== 'undefined';
-        telemetryProps.format = args.options.format;
-        telemetryProps.path = typeof args.options.path !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let filenameFromApi = '';
         const formatArgument = args.options.format ? args.options.format.toLowerCase() : '';
@@ -37,7 +49,7 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
                 return Promise.resolve();
             }
             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'
                 },
@@ -59,8 +71,8 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
             }
             const 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'
                 },
@@ -105,7 +117,7 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
             }
             const 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
@@ -135,37 +147,38 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id <id>'
-            },
-            {
-                option: '-e, --environment <environment>'
-            },
-            {
-                option: '-n, --packageDisplayName [packageDisplayName]'
-            },
-            {
-                option: '-d, --packageDescription [packageDescription]'
-            },
-            {
-                option: '-c, --packageCreatedBy [packageCreatedBy]'
-            },
-            {
-                option: '-s, --packageSourceEnvironment [packageSourceEnvironment]'
-            },
-            {
-                option: '-f, --format [format]'
-            },
-            {
-                option: '-p, --path [path]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_FlowExportCommand_instances = new WeakSet(), _FlowExportCommand_initTelemetry = function _FlowExportCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            packageDisplayName: typeof args.options.packageDisplayName !== 'undefined',
+            packageDescription: typeof args.options.packageDescription !== 'undefined',
+            packageCreatedBy: typeof args.options.packageCreatedBy !== 'undefined',
+            packageSourceEnvironment: typeof args.options.packageSourceEnvironment !== 'undefined',
+            format: args.options.format,
+            path: typeof args.options.path !== 'undefined'
+        });
+    });
+}, _FlowExportCommand_initOptions = function _FlowExportCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '-n, --packageDisplayName [packageDisplayName]'
+    }, {
+        option: '-d, --packageDescription [packageDescription]'
+    }, {
+        option: '-c, --packageCreatedBy [packageCreatedBy]'
+    }, {
+        option: '-s, --packageSourceEnvironment [packageSourceEnvironment]'
+    }, {
+        option: '-f, --format [format]'
+    }, {
+        option: '-p, --path [path]'
+    });
+}, _FlowExportCommand_initValidators = function _FlowExportCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const lowerCaseFormat = args.options.format ? args.options.format.toLowerCase() : '';
         if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
@@ -191,7 +204,7 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
             return 'Specified path where to save the file does not exist';
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new FlowExportCommand();
 //# sourceMappingURL=flow-export.js.map

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

@@ -1,9 +1,20 @@
 "use strict";
+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 _FlowGetCommand_instances, _FlowGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../request");
 const AzmgmtCommand_1 = require("../../base/AzmgmtCommand");
 const commands_1 = require("../commands");
 class FlowGetCommand extends AzmgmtCommand_1.default {
+    constructor() {
+        super();
+        _FlowGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowGetCommand_instances, "m", _FlowGetCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.GET;
     }
@@ -18,7 +29,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'
             },
@@ -35,21 +46,15 @@ class FlowGetCommand extends AzmgmtCommand_1.default {
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-e, --environment <environment>'
-            },
-            {
-                option: '--asAdmin'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
 }
+_FlowGetCommand_instances = new WeakSet(), _FlowGetCommand_initOptions = function _FlowGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '--asAdmin'
+    });
+};
 module.exports = new FlowGetCommand();
 //# sourceMappingURL=flow-get.js.map

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

@@ -1,24 +1,31 @@
 "use strict";
+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 _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const AzmgmtItemsListCommand_1 = require("../../base/AzmgmtItemsListCommand");
 const commands_1 = require("../commands");
 class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
+    constructor() {
+        super();
+        _FlowListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.LIST;
     }
     get description() {
         return 'Lists Microsoft Flows in the given environment';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.asAdmin = args.options.asAdmin === true;
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['name', 'displayName'];
     }
     commandAction(logger, args, cb) {
-        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`;
         this
             .getAllItems(url, logger, true)
             .then(() => {
@@ -36,18 +43,19 @@ class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-e, --environment <environment>'
-            },
-            {
-                option: '--asAdmin'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
 }
+_FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = function _FlowListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            asAdmin: args.options.asAdmin === true
+        });
+    });
+}, _FlowListCommand_initOptions = function _FlowListCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '--asAdmin'
+    });
+};
 module.exports = new FlowListCommand();
 //# sourceMappingURL=flow-list.js.map

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

@@ -1,4 +1,19 @@
 "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 _FlowRemoveCommand_instances, _FlowRemoveCommand_initTelemetry, _FlowRemoveCommand_initOptions, _FlowRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const cli_1 = require("../../../cli");
@@ -7,25 +22,26 @@ const utils_1 = require("../../../utils");
 const AzmgmtCommand_1 = require("../../base/AzmgmtCommand");
 const commands_1 = require("../commands");
 class FlowRemoveCommand extends AzmgmtCommand_1.default {
+    constructor() {
+        super();
+        _FlowRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowRemoveCommand_instances, "m", _FlowRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _FlowRemoveCommand_instances, "m", _FlowRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowRemoveCommand_instances, "m", _FlowRemoveCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.REMOVE;
     }
     get description() {
         return 'Removes the specified Microsoft Flow';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.asAdmin = typeof args.options.asAdmin !== 'undefined';
-        telemetryProps.confirm = typeof args.options.confirm !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         if (this.verbose) {
             logger.logToStderr(`Removing Microsoft Flow ${args.options.name}...`);
         }
         const removeFlow = () => {
             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'
@@ -38,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}'`));
                     cb();
                 }
                 else {
@@ -65,30 +81,31 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
             });
         }
     }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-e, --environment <environment>'
-            },
-            {
-                option: '--asAdmin'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_FlowRemoveCommand_instances = new WeakSet(), _FlowRemoveCommand_initTelemetry = function _FlowRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            asAdmin: typeof args.options.asAdmin !== 'undefined',
+            confirm: typeof args.options.confirm !== 'undefined'
+        });
+    });
+}, _FlowRemoveCommand_initOptions = function _FlowRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '--asAdmin'
+    }, {
+        option: '--confirm'
+    });
+}, _FlowRemoveCommand_initValidators = function _FlowRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!utils_1.validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new FlowRemoveCommand();
 //# sourceMappingURL=flow-remove.js.map

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

@@ -1,4 +1,19 @@
 "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 _FlowRunCancelCommand_instances, _FlowRunCancelCommand_initOptions, _FlowRunCancelCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -6,6 +21,12 @@ const utils_1 = require("../../../../utils");
 const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowRunCancelCommand extends AzmgmtCommand_1.default {
+    constructor() {
+        super();
+        _FlowRunCancelCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowRunCancelCommand_instances, "m", _FlowRunCancelCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowRunCancelCommand_instances, "m", _FlowRunCancelCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.RUN_CANCEL;
     }
@@ -14,11 +35,11 @@ class FlowRunCancelCommand extends AzmgmtCommand_1.default {
     }
     commandAction(logger, args, cb) {
         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 = () => {
             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'
                 },
@@ -47,30 +68,24 @@ class FlowRunCancelCommand extends AzmgmtCommand_1.default {
             });
         }
     }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-f, --flow <flow>'
-            },
-            {
-                option: '-e, --environment <environment>'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.flow)) {
-            return `${args.options.flow} is not a valid GUID`;
+}
+_FlowRunCancelCommand_instances = new WeakSet(), _FlowRunCancelCommand_initOptions = function _FlowRunCancelCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: '-f, --flowName <flowName>'
+    }, {
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '--confirm'
+    });
+}, _FlowRunCancelCommand_initValidators = function _FlowRunCancelCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!utils_1.validation.isValidGuid(args.options.flowName)) {
+            return `${args.options.flowName} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new FlowRunCancelCommand();
 //# sourceMappingURL=run-cancel.js.map

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

@@ -1,9 +1,20 @@
 "use strict";
+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 _FlowRunGetCommand_instances, _FlowRunGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowRunGetCommand extends AzmgmtCommand_1.default {
+    constructor() {
+        super();
+        _FlowRunGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowRunGetCommand_instances, "m", _FlowRunGetCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.RUN_GET;
     }
@@ -15,10 +26,10 @@ class FlowRunGetCommand extends AzmgmtCommand_1.default {
     }
     commandAction(logger, args, cb) {
         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'
             },
@@ -35,21 +46,15 @@ class FlowRunGetCommand extends AzmgmtCommand_1.default {
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-f, --flow <flow>'
-            },
-            {
-                option: '-e, --environment <environment>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
 }
+_FlowRunGetCommand_instances = new WeakSet(), _FlowRunGetCommand_initOptions = function _FlowRunGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: '-f, --flowName <flowName>'
+    }, {
+        option: '-e, --environmentName <environmentName>'
+    });
+};
 module.exports = new FlowRunGetCommand();
 //# sourceMappingURL=run-get.js.map

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

@@ -1,8 +1,19 @@
 "use strict";
+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 _FlowRunListCommand_instances, _FlowRunListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const AzmgmtItemsListCommand_1 = require("../../../base/AzmgmtItemsListCommand");
 const commands_1 = require("../../commands");
 class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
+    constructor() {
+        super();
+        _FlowRunListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowRunListCommand_instances, "m", _FlowRunListCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.RUN_LIST;
     }
@@ -14,9 +25,9 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
     }
     commandAction(logger, args, cb) {
         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`;
         this
             .getAllItems(url, logger, true)
             .then(() => {
@@ -35,18 +46,13 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-f, --flow <flow>'
-            },
-            {
-                option: '-e, --environment <environment>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
 }
+_FlowRunListCommand_instances = new WeakSet(), _FlowRunListCommand_initOptions = function _FlowRunListCommand_initOptions() {
+    this.options.unshift({
+        option: '-f, --flowName <flowName>'
+    }, {
+        option: '-e, --environmentName <environmentName>'
+    });
+};
 module.exports = new FlowRunListCommand();
 //# sourceMappingURL=run-list.js.map