From 6df92eb73095f462c802d61e1995b7ba2d9769f6 Mon Sep 17 00:00:00 2001 From: Akshaya M Date: Tue, 24 Mar 2020 15:40:30 +0530 Subject: [PATCH] added review comments --- lib/PowerShell/ServicePrincipalLogin.js | 6 +++--- lib/PowerShell/Utilities/Utils.js | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lib/PowerShell/ServicePrincipalLogin.js b/lib/PowerShell/ServicePrincipalLogin.js index 59f5cc58..7d9e8288 100644 --- a/lib/PowerShell/ServicePrincipalLogin.js +++ b/lib/PowerShell/ServicePrincipalLogin.js @@ -59,9 +59,9 @@ class ServicePrincipalLogin { const script = new ScriptBuilder_1.default().getAzPSLoginScript(ServicePrincipalLogin.scheme, this.tenantId, args); yield PowerShellToolRunner_1.default.init(); yield PowerShellToolRunner_1.default.executePowerShellScriptBlock(script, options); - const outputJson = JSON.parse(output.trim()); - if (!(Constants_1.default.Success in outputJson)) { - throw new Error(`Azure PowerShell login failed with error: ${outputJson[Constants_1.default.Error]}`); + const result = JSON.parse(output.trim()); + if (!(Constants_1.default.Success in result)) { + throw new Error(`Azure PowerShell login failed with error: ${result[Constants_1.default.Error]}`); } }); } diff --git a/lib/PowerShell/Utilities/Utils.js b/lib/PowerShell/Utilities/Utils.js index 0bddddb3..8b06d468 100644 --- a/lib/PowerShell/Utilities/Utils.js +++ b/lib/PowerShell/Utilities/Utils.js @@ -24,6 +24,15 @@ const Constants_1 = __importDefault(require("../Constants")); const ScriptBuilder_1 = __importDefault(require("./ScriptBuilder")); const PowerShellToolRunner_1 = __importDefault(require("./PowerShellToolRunner")); class Utils { + /** + * Add the folder path where Az modules are present to PSModulePath based on runner + * + * @param azPSVersion + * + * If azPSVersion is empty, folder path in which all Az modules are present are set + * If azPSVersion is not empty, folder path of exact Az module version is set + * + */ static setPSModulePath(azPSVersion = "") { let modulePath = ""; const runner = process.env.RUNNER_OS || os.type(); @@ -56,11 +65,11 @@ class Utils { yield PowerShellToolRunner_1.default.init(); yield PowerShellToolRunner_1.default.executePowerShellScriptBlock(new ScriptBuilder_1.default() .getLatestModuleScript(moduleName), options); - const outputJson = JSON.parse(output.trim()); - if (!(Constants_1.default.Success in outputJson)) { - throw new Error(outputJson[Constants_1.default.Error]); + const result = JSON.parse(output.trim()); + if (!(Constants_1.default.Success in result)) { + throw new Error(result[Constants_1.default.Error]); } - const azLatestVersion = outputJson[Constants_1.default.AzVersion]; + const azLatestVersion = result[Constants_1.default.AzVersion]; if (!Utils.isValidVersion(azLatestVersion)) { throw new Error(`Invalid AzPSVersion: ${azLatestVersion}`); }