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

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

@@ -1,53 +1,73 @@
 "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 _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`;
-        this
-            .getAllItems(url, logger, true)
-            .then(() => {
-            if (this.items.length > 0) {
-                this.items.forEach(i => {
-                    i.displayName = i.properties.displayName;
-                });
-                logger.log(this.items);
-            }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr('No Flows found');
+    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.environmentName)}/flows?api-version=2016-11-01`;
+            try {
+                yield this.getAllItems(url, logger, true);
+                if (this.items.length > 0) {
+                    this.items.forEach(i => {
+                        i.displayName = i.properties.displayName;
+                    });
+                    logger.log(this.items);
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('No Flows found');
+                    }
                 }
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-e, --environment <environment>'
-            },
-            {
-                option: '--asAdmin'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        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,94 +1,107 @@
 "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");
+const Cli_1 = require("../../../cli/Cli");
 const request_1 = require("../../../request");
-const utils_1 = require("../../../utils");
+const validation_1 = require("../../../utils/validation");
 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`,
-                resolveWithFullResponse: true,
-                headers: {
-                    accept: 'application/json'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .delete(requestOptions)
-                .then((rawRes) => {
-                // 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}'`));
-                    cb();
-                }
-                else {
-                    cb();
-                }
-            }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeFlow();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the Microsoft Flow ${args.options.name}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing Microsoft Flow ${args.options.name}...`);
+            }
+            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.environmentName)}/flows/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                    resolveWithFullResponse: true,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    const rawRes = yield request_1.default.delete(requestOptions);
+                    // 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.environmentName}'`));
+                    }
                 }
-                else {
-                    removeFlow();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-e, --environment <environment>'
-            },
-            {
-                option: '--asAdmin'
-            },
-            {
-                option: '--confirm'
+            if (args.options.confirm) {
+                yield removeFlow();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the Microsoft Flow ${args.options.name}?`
+                });
+                if (result.continue) {
+                    yield removeFlow();
+                }
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.name)) {
+}
+_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 (!validation_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,76 +1,92 @@
 "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 Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 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;
     }
     get description() {
         return 'Cancels a specific run of the specified Microsoft Flow';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.log(`Cancelling run ${args.options.name} of Microsoft Flow ${args.options.flow}...`);
-        }
-        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`,
-                headers: {
-                    accept: 'application/json'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .post(requestOptions)
-                .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            cancelFlow();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to cancel the flow run ${args.options.name}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    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.flowName}...`);
+            }
+            const cancelFlow = () => __awaiter(this, void 0, void 0, function* () {
+                const requestOptions = {
+                    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'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    cancelFlow();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-f, --flow <flow>'
-            },
-            {
-                option: '-e, --environment <environment>'
-            },
-            {
-                option: '--confirm'
+            if (args.options.confirm) {
+                yield cancelFlow();
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to cancel the flow run ${args.options.name}?`
+                });
+                if (result.continue) {
+                    yield cancelFlow();
+                }
+            }
+        });
     }
-    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 (!validation_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,29 @@
 "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 _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;
     }
@@ -13,43 +33,40 @@ class FlowRunGetCommand extends AzmgmtCommand_1.default {
     defaultProperties() {
         return ['name', 'startTime', 'endTime', 'status', 'triggerName'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information about run ${args.options.name} of Microsoft Flow ${args.options.flow}...`);
-        }
-        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`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            res.startTime = res.properties.startTime;
-            res.endTime = res.properties.endTime || '';
-            res.status = res.properties.status;
-            res.triggerName = res.properties.trigger.name;
-            logger.log(res);
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-f, --flow <flow>'
-            },
-            {
-                option: '-e, --environment <environment>'
+    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.flowName}...`);
+            }
+            const requestOptions = {
+                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'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                res.startTime = res.properties.startTime;
+                res.endTime = res.properties.endTime || '';
+                res.status = res.properties.status;
+                res.triggerName = res.properties.trigger.name;
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        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,28 @@
 "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 _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;
     }
@@ -12,41 +32,39 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
     defaultProperties() {
         return ['name', 'startTime', 'status'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flow}...`);
-        }
-        const url = `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.flow)}/runs?api-version=2016-11-01`;
-        this
-            .getAllItems(url, logger, true)
-            .then(() => {
-            if (this.items.length > 0) {
-                this.items.forEach(i => {
-                    i.startTime = i.properties.startTime;
-                    i.status = i.properties.status;
-                });
-                logger.log(this.items);
+    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.flowName}...`);
             }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr('No runs found');
+            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) {
+                    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');
+                    }
                 }
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-f, --flow <flow>'
-            },
-            {
-                option: '-e, --environment <environment>'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        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