@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7a78ebe

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

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 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 FlowExportCommand extends AzmgmtCommand_1.default {
@@ -35,117 +35,117 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
     get description() {
         return 'Exports the specified Microsoft Flow as a file';
     }
-    commandAction(logger, args, cb) {
-        let filenameFromApi = '';
-        const formatArgument = args.options.format ? args.options.format.toLowerCase() : '';
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving package resources for Microsoft Flow ${args.options.id}...`);
-        }
-        (() => {
-            if (formatArgument === 'json') {
-                if (this.debug) {
-                    logger.logToStderr('format = json, skipping listing package resources step');
-                }
-                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`,
-                headers: {
-                    accept: 'application/json'
-                },
-                data: {
-                    "baseResourceIds": [
-                        `/providers/Microsoft.Flow/flows/${args.options.id}`
-                    ]
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })()
-            .then((res) => {
-            if (typeof res !== 'undefined' && res.errors && res.errors.length && res.errors.length > 0) {
-                return Promise.reject(res.errors[0].message);
-            }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let filenameFromApi = '';
+            const formatArgument = args.options.format ? args.options.format.toLowerCase() : '';
             if (this.verbose) {
-                logger.logToStderr(`Initiating package export for Microsoft Flow ${args.options.id}...`);
+                logger.logToStderr(`Retrieving package resources for Microsoft Flow ${args.options.id}...`);
             }
-            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`,
-                headers: {
-                    accept: 'application/json'
-                },
-                responseType: 'json'
-            };
-            if (formatArgument !== 'json') {
-                // adds suggestedCreationType property to all resources
-                // see https://github.com/pnp/cli-microsoft365/issues/1845
-                Object.keys(res.resources).forEach((key) => {
-                    res.resources[key].type === 'Microsoft.Flow/flows'
-                        ? res.resources[key].suggestedCreationType = 'Update'
-                        : res.resources[key].suggestedCreationType = 'Existing';
-                });
-                requestOptions['data'] = {
-                    "includedResourceIds": [
-                        `/providers/Microsoft.Flow/flows/${args.options.id}`
-                    ],
-                    "details": {
-                        "displayName": args.options.packageDisplayName,
-                        "description": args.options.packageDescription,
-                        "creator": args.options.packageCreatedBy,
-                        "sourceEnvironment": args.options.packageSourceEnvironment
+            try {
+                let res;
+                if (formatArgument === 'json') {
+                    if (this.debug) {
+                        logger.logToStderr('format = json, skipping listing package resources step');
+                    }
+                }
+                else {
+                    const requestOptions = {
+                        url: `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environmentName)}/listPackageResources?api-version=2016-11-01`,
+                        headers: {
+                            accept: 'application/json'
+                        },
+                        data: {
+                            "baseResourceIds": [
+                                `/providers/Microsoft.Flow/flows/${args.options.id}`
+                            ]
+                        },
+                        responseType: 'json'
+                    };
+                    res = yield request_1.default.post(requestOptions);
+                }
+                if (typeof res !== 'undefined' && res.errors && res.errors.length && res.errors.length > 0) {
+                    throw res.errors[0].message;
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Initiating package export for Microsoft Flow ${args.options.id}...`);
+                }
+                let requestOptions = {
+                    url: formatArgument === 'json' ?
+                        `${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'
                     },
-                    "resources": res.resources
+                    responseType: 'json'
                 };
-            }
-            return formatArgument === 'json' ? request_1.default.get(requestOptions) : request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(`Getting file for Microsoft Flow ${args.options.id}...`);
-            }
-            const downloadFileUrl = formatArgument === 'json' ? '' : res.packageLink.value;
-            const filenameRegEx = /([^\/]+\.zip)/i;
-            filenameFromApi = formatArgument === 'json' ? `${res.properties.displayName}.json` : (filenameRegEx.exec(downloadFileUrl) || ['output.zip'])[0];
-            // Replace all illegal characters from the file name
-            const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
-            filenameFromApi = filenameFromApi.replace(illegalCharsRegEx, '_');
-            if (this.debug) {
-                logger.logToStderr(`Filename from PowerApps API: ${filenameFromApi}`);
-                logger.logToStderr('');
-            }
-            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`
-                    : downloadFileUrl,
-                // Set responseType to arraybuffer, otherwise binary data will be encoded
-                // to utf8 and binary data is corrupt
-                responseType: 'arraybuffer',
-                headers: formatArgument === 'json' ?
-                    {
-                        accept: 'application/json'
-                    } : {
-                    'x-anonymous': true
+                if (formatArgument !== 'json') {
+                    // adds suggestedCreationType property to all resources
+                    // see https://github.com/pnp/cli-microsoft365/issues/1845
+                    Object.keys(res.resources).forEach((key) => {
+                        res.resources[key].type === 'Microsoft.Flow/flows'
+                            ? res.resources[key].suggestedCreationType = 'Update'
+                            : res.resources[key].suggestedCreationType = 'Existing';
+                    });
+                    requestOptions['data'] = {
+                        "includedResourceIds": [
+                            `/providers/Microsoft.Flow/flows/${args.options.id}`
+                        ],
+                        "details": {
+                            "displayName": args.options.packageDisplayName,
+                            "description": args.options.packageDescription,
+                            "creator": args.options.packageCreatedBy,
+                            "sourceEnvironment": args.options.packageSourceEnvironment
+                        },
+                        "resources": res.resources
+                    };
                 }
-            };
-            return formatArgument === 'json' ?
-                request_1.default.post(requestOptions)
-                : request_1.default.get(requestOptions);
-        })
-            .then((file) => {
-            const path = args.options.path ? args.options.path : `./${filenameFromApi}`;
-            fs.writeFileSync(path, file, 'binary');
-            if (!args.options.path || this.verbose) {
+                res = formatArgument === 'json' ? yield request_1.default.get(requestOptions) : yield request_1.default.post(requestOptions);
                 if (this.verbose) {
-                    logger.logToStderr(`File saved to path '${path}'`);
+                    logger.logToStderr(`Getting file for Microsoft Flow ${args.options.id}...`);
                 }
-                else {
-                    logger.log(path);
+                const downloadFileUrl = formatArgument === 'json' ? '' : res.packageLink.value;
+                const filenameRegEx = /([^\/]+\.zip)/i;
+                filenameFromApi = formatArgument === 'json' ? `${res.properties.displayName}.json` : (filenameRegEx.exec(downloadFileUrl) || ['output.zip'])[0];
+                // Replace all illegal characters from the file name
+                const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
+                filenameFromApi = filenameFromApi.replace(illegalCharsRegEx, '_');
+                if (this.debug) {
+                    logger.logToStderr(`Filename from PowerApps API: ${filenameFromApi}`);
+                    logger.logToStderr('');
+                }
+                requestOptions = {
+                    url: formatArgument === 'json' ?
+                        `${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
+                    responseType: 'arraybuffer',
+                    headers: formatArgument === 'json' ?
+                        {
+                            accept: 'application/json'
+                        } : {
+                        'x-anonymous': true
+                    }
+                };
+                const file = formatArgument === 'json' ?
+                    yield request_1.default.post(requestOptions)
+                    : yield request_1.default.get(requestOptions);
+                const path = args.options.path ? args.options.path : `./${filenameFromApi}`;
+                fs.writeFileSync(path, file, 'binary');
+                if (!args.options.path || this.verbose) {
+                    if (this.verbose) {
+                        logger.logToStderr(`File saved to path '${path}'`);
+                    }
+                    else {
+                        logger.log(path);
+                    }
                 }
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _FlowExportCommand_instances = new WeakSet(), _FlowExportCommand_initTelemetry = function _FlowExportCommand_initTelemetry() {
@@ -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]'
     }, {
@@ -180,7 +180,7 @@ _FlowExportCommand_instances = new WeakSet(), _FlowExportCommand_initTelemetry =
 }, _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)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.format && (lowerCaseFormat !== 'json' && lowerCaseFormat !== 'zip')) {

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

@@ -1,4 +1,13 @@
 "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");
@@ -24,34 +33,37 @@ class FlowGetCommand extends AzmgmtCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName', 'description', 'triggers', 'actions'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            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`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            res.displayName = res.properties.displayName;
-            res.description = res.properties.definitionSummary.description || '';
-            res.triggers = res.properties.definitionSummary.triggers.map((t) => (t.type + (t.kind ? "-" + t.kind : ''))).join(', ');
-            res.actions = res.properties.definitionSummary.actions.map((a) => (a.type + (a.swaggerOperationId ? "-" + a.swaggerOperationId : ''))).join(', ');
-            logger.log(res);
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                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.environmentName)}/flows/${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.displayName = res.properties.displayName;
+                res.description = res.properties.definitionSummary.description || '';
+                res.triggers = res.properties.definitionSummary.triggers.map((t) => (t.type + (t.kind ? "-" + t.kind : ''))).join(', ');
+                res.actions = res.properties.definitionSummary.actions.map((a) => (a.type + (a.swaggerOperationId ? "-" + a.swaggerOperationId : ''))).join(', ');
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _FlowGetCommand_instances = new WeakSet(), _FlowGetCommand_initOptions = function _FlowGetCommand_initOptions() {
     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

@@ -1,4 +1,13 @@
 "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");
@@ -24,24 +33,27 @@ class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
     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');
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
 }
 _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = function _FlowListCommand_initTelemetry() {
@@ -52,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

@@ -16,9 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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 {
@@ -35,51 +35,47 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
     get description() {
         return 'Removes the specified Microsoft Flow';
     }
-    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);
                 }
             });
-        }
+            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();
+                }
+            }
+        });
     }
 }
 _FlowRemoveCommand_instances = new WeakSet(), _FlowRemoveCommand_initTelemetry = function _FlowRemoveCommand_initTelemetry() {
@@ -93,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'
     }, {
@@ -101,7 +97,7 @@ _FlowRemoveCommand_instances = new WeakSet(), _FlowRemoveCommand_initTelemetry =
     });
 }, _FlowRemoveCommand_initValidators = function _FlowRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.name)) {
+        if (!validation_1.validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
         return true;

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 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 {
@@ -33,56 +33,57 @@ class FlowRunCancelCommand extends AzmgmtCommand_1.default {
     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);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield cancelFlow();
+            }
+            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();
+                }
+            }
+        });
     }
 }
 _FlowRunCancelCommand_instances = new WeakSet(), _FlowRunCancelCommand_initOptions = function _FlowRunCancelCommand_initOptions() {
     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 (!utils_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;
     }));