From fb74babeb9797a014b3f8f78a42e27ce74625627 Mon Sep 17 00:00:00 2001 From: aksm-ms Date: Fri, 6 Nov 2020 13:49:29 +0530 Subject: [PATCH] addressed review comments --- lib/main.js | 16 ++++++++-------- src/main.ts | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/main.js b/lib/main.js index 30e4c0f0..c3933519 100644 --- a/lib/main.js +++ b/lib/main.js @@ -37,14 +37,14 @@ function main() { core.exportVariable('AZUREPS_HOST_ENVIRONMENT', azurePSHostEnv); azPath = yield io.which("az", true); let output = ""; - const options = { + const execOptions = { listeners: { stdout: (data) => { output += data.toString(); } } }; - yield executeAzCliCommand("--version", true, options); + yield executeAzCliCommand("--version", true, execOptions); core.debug(`az cli version used:\n${output}`); let creds = core.getInput('creds', { required: true }); let secrets = new actions_secret_parser_1.SecretParser(creds, actions_secret_parser_1.FormatType.JSON); @@ -62,28 +62,28 @@ function main() { } // Attempting Az cli login if (allowNoSubscriptionsLogin) { - let parameters = [ + let args = [ "--allow-no-subscriptions", "--service-principal", "-u", servicePrincipalId, "-p", servicePrincipalKey, "--tenant", tenantId ]; - yield executeAzCliCommand(`login`, true, {}, parameters); + yield executeAzCliCommand(`login`, true, {}, args); } else { - let parameters = [ + let args = [ "--service-principal", "-u", servicePrincipalId, "-p", servicePrincipalKey, "--tenant", tenantId ]; - yield executeAzCliCommand(`login`, true, {}, parameters); - parameters = [ + yield executeAzCliCommand(`login`, true, {}, args); + args = [ "--subscription", subscriptionId ]; - yield executeAzCliCommand(`account set`, true, {}, parameters); + yield executeAzCliCommand(`account set`, true, {}, args); } isAzCLISuccess = true; if (enableAzPSSession) { diff --git a/src/main.ts b/src/main.ts index caf3856d..3fd4b03a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -22,14 +22,14 @@ async function main() { azPath = await io.which("az", true); let output: string = ""; - const options: any = { + const execOptions: any = { listeners: { stdout: (data: Buffer) => { output += data.toString(); } } }; - await executeAzCliCommand("--version", true, options); + await executeAzCliCommand("--version", true, execOptions); core.debug(`az cli version used:\n${output}`); let creds = core.getInput('creds', { required: true }); @@ -50,28 +50,28 @@ async function main() { // Attempting Az cli login if (allowNoSubscriptionsLogin) { - let parameters = [ + let args = [ "--allow-no-subscriptions", "--service-principal", "-u", servicePrincipalId, "-p", servicePrincipalKey, "--tenant", tenantId ]; - await executeAzCliCommand(`login`, true, {}, parameters); + await executeAzCliCommand(`login`, true, {}, args); } else { - let parameters = [ + let args = [ "--service-principal", "-u", servicePrincipalId, "-p", servicePrincipalKey, "--tenant", tenantId ]; - await executeAzCliCommand(`login`, true, {}, parameters); - parameters = [ + await executeAzCliCommand(`login`, true, {}, args); + args = [ "--subscription", subscriptionId ]; - await executeAzCliCommand(`account set`, true, {}, parameters); + await executeAzCliCommand(`account set`, true, {}, args); } isAzCLISuccess = true; if (enableAzPSSession) {