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

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

@@ -1,45 +1,64 @@
 "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 _FlowDisableCommand_instances, _FlowDisableCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../request");
 const AzmgmtCommand_1 = require("../../base/AzmgmtCommand");
 const commands_1 = require("../commands");
 class FlowDisableCommand extends AzmgmtCommand_1.default {
+    constructor() {
+        super();
+        _FlowDisableCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowDisableCommand_instances, "m", _FlowDisableCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.DISABLE;
     }
     get description() {
         return 'Disables specified Microsoft Flow';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Disables Microsoft Flow ${args.options.name}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.name)}/stop?api-version=2016-11-01`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-e, --environment <environment>'
-            },
-            {
-                option: '--asAdmin'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Disables Microsoft Flow ${args.options.name}...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.name)}/stop?api-version=2016-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
 }
+_FlowDisableCommand_instances = new WeakSet(), _FlowDisableCommand_initOptions = function _FlowDisableCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '--asAdmin'
+    });
+};
 module.exports = new FlowDisableCommand();
 //# sourceMappingURL=flow-disable.js.map

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

@@ -1,45 +1,64 @@
 "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 _FlowEnableCommand_instances, _FlowEnableCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../request");
 const AzmgmtCommand_1 = require("../../base/AzmgmtCommand");
 const commands_1 = require("../commands");
 class FlowEnableCommand extends AzmgmtCommand_1.default {
+    constructor() {
+        super();
+        _FlowEnableCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowEnableCommand_instances, "m", _FlowEnableCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.ENABLE;
     }
     get description() {
         return 'Enables specified Microsoft Flow';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Enables Microsoft Flow ${args.options.name}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.name)}/start?api-version=2016-11-01`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-e, --environment <environment>'
-            },
-            {
-                option: '--asAdmin'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Enables Microsoft Flow ${args.options.name}...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.name)}/start?api-version=2016-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
 }
+_FlowEnableCommand_instances = new WeakSet(), _FlowEnableCommand_initOptions = function _FlowEnableCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '--asAdmin'
+    });
+};
 module.exports = new FlowEnableCommand();
 //# sourceMappingURL=flow-enable.js.map

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

@@ -1,173 +1,186 @@
 "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");
 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 {
+    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() : '';
-        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));
-    }
-    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]'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        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)) {
+        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')) {
@@ -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,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 _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;
     }
@@ -13,43 +33,40 @@ 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));
-    }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-e, --environment <environment>'
-            },
-            {
-                option: '--asAdmin'
+    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);
             }
-        ];
-        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