azure/login
1
0
Fork 0
mirror of https://github.com/azure/login.git synced 2026-03-15 09:20:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added changes for review comments

Browse Source
This commit is contained in:
Akshaya M
2020-03-20 16:00:28 +05:30
parent a2be320a3e
commit ad3250b83a
9 changed files with 51 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/PowerShell/ServicePrincipalLogin.js
View File

@@ -36,7 +36,7 @@ class ServicePrincipalLogin {
Utils_1.default.setPSModulePath(); Utils_1.default.setPSModulePath();
const script = new ScriptBuilder_1.default().getLatestModuleScript(Constants_1.default.moduleName); const script = new ScriptBuilder_1.default().getLatestModuleScript(Constants_1.default.moduleName);
const outputJson = yield this.getLatestModule(script); const outputJson = yield this.getLatestModule(script);
const azLatestVersion = outputJson.Constants.AzPSVersion; const azLatestVersion = outputJson[Constants_1.default.AzVersion];
if (!(Constants_1.default.Success in outputJson) || !Utils_1.default.isValidVersion(azLatestVersion)) { if (!(Constants_1.default.Success in outputJson) || !Utils_1.default.isValidVersion(azLatestVersion)) {
throw new Error(`Invalid AzPSVersion: ${azLatestVersion}`); throw new Error(`Invalid AzPSVersion: ${azLatestVersion}`);
} }
@@ -55,7 +55,7 @@ class ServicePrincipalLogin {
} }
}; };
yield PowerShellToolRunner_1.default.init(); yield PowerShellToolRunner_1.default.init();
yield PowerShellToolRunner_1.default.executePowerShellCommand(script, options); yield PowerShellToolRunner_1.default.executePowerShellScriptBlock(script, options);
return JSON.parse(output.trim()); return JSON.parse(output.trim());
}); });
} }
@@ -78,10 +78,10 @@ class ServicePrincipalLogin {
}; };
const script = new ScriptBuilder_1.default().getAzPSLoginScript(ServicePrincipalLogin.scheme, this.tenantId, args); const script = new ScriptBuilder_1.default().getAzPSLoginScript(ServicePrincipalLogin.scheme, this.tenantId, args);
yield PowerShellToolRunner_1.default.init(); yield PowerShellToolRunner_1.default.init();
yield PowerShellToolRunner_1.default.executePowerShellCommand(script, options); yield PowerShellToolRunner_1.default.executePowerShellScriptBlock(script, options);
const outputJson = JSON.parse(output.trim()); const outputJson = JSON.parse(output.trim());
if (!(Constants_1.default.Success in outputJson)) { if (!(Constants_1.default.Success in outputJson)) {
throw new Error(`Azure PowerShell login failed with error: ${outputJson.Constants.Error}`); throw new Error(`Azure PowerShell login failed with error: ${outputJson[Constants_1.default.Error]}`);
} }
}); });
} }

5
lib/PowerShell/Utilities/PowerShellToolRunner.js
View File

@@ -26,6 +26,11 @@ class PowerShellToolRunner {
} }
}); });
} }
static executePowerShellScriptBlock(scriptBlock, options = {}) {
return __awaiter(this, void 0, void 0, function* () {
yield exec.exec(`${PowerShellToolRunner.psPath} -Command`, [scriptBlock], options);
});
}
static executePowerShellCommand(command, options = {}) { static executePowerShellCommand(command, options = {}) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
yield exec.exec(`"${PowerShellToolRunner.psPath}" -Command "${command}"`, [], options); yield exec.exec(`"${PowerShellToolRunner.psPath}" -Command "${command}"`, [], options);

31
lib/PowerShell/Utilities/ScriptBuilder.js
View File

@@ -22,38 +22,39 @@ class ScriptBuilder {
if (scheme === Constants_1.default.ServicePrincipal) { if (scheme === Constants_1.default.ServicePrincipal) {
command += `Connect-AzAccount -ServicePrincipal -Tenant ${tenantId} -Credential \ command += `Connect-AzAccount -ServicePrincipal -Tenant ${tenantId} -Credential \
(New-Object System.Management.Automation.PSCredential('${args.servicePrincipalId}',(ConvertTo-SecureString ${args.servicePrincipalKey} -AsPlainText -Force))) \ (New-Object System.Management.Automation.PSCredential('${args.servicePrincipalId}',(ConvertTo-SecureString ${args.servicePrincipalKey} -AsPlainText -Force))) \
-Environment ${args.environment};`; -Environment ${args.environment} | out-null;`;
if (args.scopeLevel === Constants_1.default.Subscription) { if (args.scopeLevel === Constants_1.default.Subscription) {
command += `Set-AzContext -SubscriptionId ${args.subscriptionId} -TenantId ${tenantId};`; command += `Set-AzContext -SubscriptionId ${args.subscriptionId} -TenantId ${tenantId} | out-null;`;
} }
} }
command += `Get-AzContext`;
this.script += `try { this.script += `try {
$$ErrorActionPreference = "Stop"; $ErrorActionPreference = "Stop"
$$output = @{}; $WarningPreference = "SilentlyContinue"
$output = @{}
${command} ${command}
$$output['${Constants_1.default.Success}'] = "true"; $output['${Constants_1.default.Success}'] = "true"
} }
catch { catch {
$$output['${Constants_1.default.Error}'] = $$_.exception.Message; $output['${Constants_1.default.Error}'] = $_.exception.Message
} }
return ConvertTo-Json $$a`; return ConvertTo-Json $output`;
core.debug(`Azure PowerShell Login Script: ${this.script}`); core.debug(`Azure PowerShell Login Script: ${this.script}`);
return this.script; return this.script;
} }
getLatestModuleScript(moduleName) { getLatestModuleScript(moduleName) {
const command = `Get-Module -Name ${moduleName} -ListAvailable | Sort-Object Version -Descending | Select-Object -First 1`; const command = `Get-Module -Name ${moduleName} -ListAvailable | Sort-Object Version -Descending | Select-Object -First 1`;
this.script += `try { this.script += `try {
$$ErrorActionPreference = "Stop"; $ErrorActionPreference = "Stop"
$$output = @{}; $WarningPreference = "SilentlyContinue"
$$data = ${command}; $output = @{}
$$output['${Constants_1.default.AzVersion}'] = $$data.Version.ToString(); $data = ${command}
$$output['${Constants_1.default.Success}'] = "true"; $output['${Constants_1.default.AzVersion}'] = $data.Version.ToString()
$output['${Constants_1.default.Success}'] = "true"
} }
catch { catch {
$$output['${Constants_1.default.Error}'] = $$_.exception.Message; $output['${Constants_1.default.Error}'] = $_.exception.Message
} }
return ConvertTo-Json $$a`; return ConvertTo-Json $output`;
core.debug(`GetLatestModuleScript: ${this.script}`); core.debug(`GetLatestModuleScript: ${this.script}`);
return this.script; return this.script;
} }

3
lib/PowerShell/Utilities/Utils.js
View File

@@ -26,8 +26,7 @@ class Utils {
break; break;
case "macos": case "macos":
case "darwin": case "darwin":
// TODO: add modulepath throw new Error(`OS not supported`);
break;
default: default:
throw new Error(`Unknown os: ${runner.toLowerCase()}`); throw new Error(`Unknown os: ${runner.toLowerCase()}`);
} }

96
lib/loginAzurePowerShell.js
View File

@@ -1,96 +0,0 @@
"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 __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
result["default"] = mod;
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
const os = __importStar(require("os"));
const core = __importStar(require("@actions/core"));
const exec = __importStar(require("@actions/exec"));
const io = __importStar(require("@actions/io"));
var psPath;
exports.initializeAz = (servicePrincipalId, servicePrincipalKey, tenantId, subscriptionId) => __awaiter(void 0, void 0, void 0, function* () {
psPath = yield io.which("pwsh", true);
yield importModule();
yield loginToAzure(servicePrincipalId, servicePrincipalKey, tenantId, subscriptionId);
});
function importModule() {
return __awaiter(this, void 0, void 0, function* () {
setPSModulePath();
const prefix = "az_";
const moduleName = "Az.Accounts";
const azLatestVersion = yield getLatestModule(moduleName);
core.debug(`Az Module version used: ${azLatestVersion}`);
setPSModulePath(`${prefix}${azLatestVersion}`);
});
}
function setPSModulePath(azPSVersion = "") {
let modulePath = "";
const RUNNER = process.env.RUNNER_OS || os.type();
switch (RUNNER) {
case "Linux":
modulePath = `/usr/share/${azPSVersion}:`;
break;
case "Windows":
case "Windows_NT":
modulePath = `C:\\Modules\\${azPSVersion};`;
break;
case "macOS":
case "Darwin":
// TODO: add modulepath
break;
}
process.env.PSModulePath = `${modulePath}${process.env.PSModulePath}`;
}
function getLatestModule(moduleName) {
return __awaiter(this, void 0, void 0, function* () {
let output = "";
let error = "";
let options = {
listeners: {
stdout: (data) => {
output += data.toString();
},
stderr: (data) => {
error += data.toString();
}
}
};
yield executePowerShellCommand(`(Get-Module -Name ${moduleName} -ListAvailable | Sort-Object Version -Descending | Select-Object -First 1).Version.ToString()`, options);
return output.trim();
});
}
function loginToAzure(servicePrincipalId, servicePrincipalKey, tenantId, subscriptionId) {
return __awaiter(this, void 0, void 0, function* () {
const environment = "AzureCloud";
yield executePowerShellCommand(`Clear-AzContext -Scope Process`);
yield executePowerShellCommand(`Clear-AzContext -Scope CurrentUser -Force -ErrorAction SilentlyContinue`);
yield executePowerShellCommand(`Connect-AzAccount -ServicePrincipal -Tenant ${tenantId} -Credential \
(New-Object System.Management.Automation.PSCredential('${servicePrincipalId}',(ConvertTo-SecureString ${servicePrincipalKey} -AsPlainText -Force))) \
-Environment ${environment}`);
yield executePowerShellCommand(`Set-AzContext -SubscriptionId ${subscriptionId} -TenantId ${tenantId}`);
yield executePowerShellCommand(`Get-AzContext`);
});
}
function executePowerShellCommand(command, options = {}) {
return __awaiter(this, void 0, void 0, function* () {
try {
yield exec.exec(`"${psPath}" -Command "${command}"`, [], options);
}
catch (error) {
throw new Error(error);
}
});
}

8
src/PowerShell/ServicePrincipalLogin.ts
View File

@@ -25,7 +25,7 @@ export class ServicePrincipalLogin implements IAzurePowerShellSession {
Utils.setPSModulePath(); Utils.setPSModulePath();
const script: string = new ScriptBuilder().getLatestModuleScript(Constants.moduleName); const script: string = new ScriptBuilder().getLatestModuleScript(Constants.moduleName);
const outputJson = await this.getLatestModule(script); const outputJson = await this.getLatestModule(script);
const azLatestVersion: string = outputJson.Constants.AzPSVersion; const azLatestVersion: string = outputJson[Constants.AzVersion];
if (!(Constants.Success in outputJson) || !Utils.isValidVersion(azLatestVersion)) { if (!(Constants.Success in outputJson) || !Utils.isValidVersion(azLatestVersion)) {
throw new Error(`Invalid AzPSVersion: ${azLatestVersion}`); throw new Error(`Invalid AzPSVersion: ${azLatestVersion}`);
} }
@@ -43,7 +43,7 @@ export class ServicePrincipalLogin implements IAzurePowerShellSession {
} }
}; };
await PowerShellToolRunner.init(); await PowerShellToolRunner.init();
await PowerShellToolRunner.executePowerShellCommand(script, options); await PowerShellToolRunner.executePowerShellScriptBlock(script, options);
return JSON.parse(output.trim()); return JSON.parse(output.trim());
} }
@@ -65,10 +65,10 @@ export class ServicePrincipalLogin implements IAzurePowerShellSession {
} }
const script: string = new ScriptBuilder().getAzPSLoginScript(ServicePrincipalLogin.scheme, this.tenantId, args); const script: string = new ScriptBuilder().getAzPSLoginScript(ServicePrincipalLogin.scheme, this.tenantId, args);
await PowerShellToolRunner.init(); await PowerShellToolRunner.init();
await PowerShellToolRunner.executePowerShellCommand(script, options); await PowerShellToolRunner.executePowerShellScriptBlock(script, options);
const outputJson: any = JSON.parse(output.trim()); const outputJson: any = JSON.parse(output.trim());
if (!(Constants.Success in outputJson)) { if (!(Constants.Success in outputJson)) {
throw new Error(`Azure PowerShell login failed with error: ${outputJson.Constants.Error}`); throw new Error(`Azure PowerShell login failed with error: ${outputJson[Constants.Error]}`);
} }
} }

4
src/PowerShell/Utilities/PowerShellToolRunner.ts
View File

@@ -10,6 +10,10 @@ export default class PowerShellToolRunner {
} }
} }
static async executePowerShellScriptBlock(scriptBlock: string, options: any = {}) {
await exec.exec(`${PowerShellToolRunner.psPath} -Command`, [scriptBlock], options)
}
static async executePowerShellCommand(command: string, options: any = {}) { static async executePowerShellCommand(command: string, options: any = {}) {
await exec.exec(`"${PowerShellToolRunner.psPath}" -Command "${command}"`, [], options); await exec.exec(`"${PowerShellToolRunner.psPath}" -Command "${command}"`, [], options);
} }

31
src/PowerShell/Utilities/ScriptBuilder.ts
View File

@@ -11,22 +11,22 @@ export default class ScriptBuilder {
if (scheme === Constants.ServicePrincipal) { if (scheme === Constants.ServicePrincipal) {
command += `Connect-AzAccount -ServicePrincipal -Tenant ${tenantId} -Credential \ command += `Connect-AzAccount -ServicePrincipal -Tenant ${tenantId} -Credential \
(New-Object System.Management.Automation.PSCredential('${args.servicePrincipalId}',(ConvertTo-SecureString ${args.servicePrincipalKey} -AsPlainText -Force))) \ (New-Object System.Management.Automation.PSCredential('${args.servicePrincipalId}',(ConvertTo-SecureString ${args.servicePrincipalKey} -AsPlainText -Force))) \
-Environment ${args.environment};`; -Environment ${args.environment} | out-null;`;
if (args.scopeLevel === Constants.Subscription) { if (args.scopeLevel === Constants.Subscription) {
command += `Set-AzContext -SubscriptionId ${args.subscriptionId} -TenantId ${tenantId};`; command += `Set-AzContext -SubscriptionId ${args.subscriptionId} -TenantId ${tenantId} | out-null;`;
} }
} }
command += `Get-AzContext`;
this.script += `try { this.script += `try {
$$ErrorActionPreference = "Stop"; $ErrorActionPreference = "Stop"
$$output = @{}; $WarningPreference = "SilentlyContinue"
$output = @{}
${command} ${command}
$$output['${Constants.Success}'] = "true"; $output['${Constants.Success}'] = "true"
} }
catch { catch {
$$output['${Constants.Error}'] = $$_.exception.Message; $output['${Constants.Error}'] = $_.exception.Message
} }
return ConvertTo-Json $$a`; return ConvertTo-Json $output`;
core.debug(`Azure PowerShell Login Script: ${this.script}`); core.debug(`Azure PowerShell Login Script: ${this.script}`);
return this.script; return this.script;
} }
@@ -34,16 +34,17 @@ export default class ScriptBuilder {
getLatestModuleScript(moduleName: string): string { getLatestModuleScript(moduleName: string): string {
const command: string = `Get-Module -Name ${moduleName} -ListAvailable | Sort-Object Version -Descending | Select-Object -First 1`; const command: string = `Get-Module -Name ${moduleName} -ListAvailable | Sort-Object Version -Descending | Select-Object -First 1`;
this.script += `try { this.script += `try {
$$ErrorActionPreference = "Stop"; $ErrorActionPreference = "Stop"
$$output = @{}; $WarningPreference = "SilentlyContinue"
$$data = ${command}; $output = @{}
$$output['${Constants.AzVersion}'] = $$data.Version.ToString(); $data = ${command}
$$output['${Constants.Success}'] = "true"; $output['${Constants.AzVersion}'] = $data.Version.ToString()
$output['${Constants.Success}'] = "true"
} }
catch { catch {
$$output['${Constants.Error}'] = $$_.exception.Message; $output['${Constants.Error}'] = $_.exception.Message
} }
return ConvertTo-Json $$a`; return ConvertTo-Json $output`;
core.debug(`GetLatestModuleScript: ${this.script}`); core.debug(`GetLatestModuleScript: ${this.script}`);
return this.script; return this.script;
} }

4
src/PowerShell/Utilities/Utils.ts
View File

@@ -1,7 +1,6 @@
import * as os from 'os'; import * as os from 'os';
import Constants from '../Constants'; import Constants from '../Constants';
import PowerShellToolRunner from './PowerShellToolRunner';
export default class Utils { export default class Utils {
static setPSModulePath(azPSVersion: string = "") { static setPSModulePath(azPSVersion: string = "") {
@@ -17,8 +16,7 @@ export default class Utils {
break; break;
case "macos": case "macos":
case "darwin": case "darwin":
// TODO: add modulepath throw new Error(`OS not supported`);
break;
default: default:
throw new Error(`Unknown os: ${runner.toLowerCase()}`); throw new Error(`Unknown os: ${runner.toLowerCase()}`);
} }