azure/login
1
0
Fork 0
mirror of https://github.com/azure/login.git synced 2026-06-08 22:47:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

added review comments

Browse source
This commit is contained in:
Akshaya M 2020-03-24 14:17:39 +05:30
commit 97c66dece8
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/PowerShell/ServicePrincipalLogin.ts
View file

@ -47,9 +47,9 @@ export class ServicePrincipalLogin implements IAzurePowerShellSession {
const script: string = new ScriptBuilder().getAzPSLoginScript(ServicePrincipalLogin.scheme, this.tenantId, args);
await PowerShellToolRunner.init();
await PowerShellToolRunner.executePowerShellScriptBlock(script, options);
const outputJson: any = JSON.parse(output.trim());
if (!(Constants.Success in outputJson)) {
throw new Error(`Azure PowerShell login failed with error: ${outputJson[Constants.Error]}`);
const result: any = JSON.parse(output.trim());
if (!(Constants.Success in result)) {
throw new Error(`Azure PowerShell login failed with error: ${result[Constants.Error]}`);
}
}

17
src/PowerShell/Utilities/Utils.ts
View file

@ -5,6 +5,15 @@ import ScriptBuilder from './ScriptBuilder';
import PowerShellToolRunner from './PowerShellToolRunner';
export default 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: string = "") {
let modulePath: string = "";
const runner: string = process.env.RUNNER_OS || os.type();
@ -37,11 +46,11 @@ export default class Utils {
await PowerShellToolRunner.init();
await PowerShellToolRunner.executePowerShellScriptBlock(new ScriptBuilder()
.getLatestModuleScript(moduleName), options);
const outputJson = JSON.parse(output.trim());
if (!(Constants.Success in outputJson)) {
throw new Error(outputJson[Constants.Error]);
const result = JSON.parse(output.trim());
if (!(Constants.Success in result)) {
throw new Error(result[Constants.Error]);
}
const azLatestVersion: string = outputJson[Constants.AzVersion];
const azLatestVersion: string = result[Constants.AzVersion];
if (!Utils.isValidVersion(azLatestVersion)) {
throw new Error(`Invalid AzPSVersion: ${azLatestVersion}`);
}