azure/login
1
0
Fork 0
mirror of https://github.com/azure/login.git synced 2026-06-07 03:17:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

adding az cli version debug logs (#76)

Browse source
This commit is contained in:
aksm-ms 2020-11-03 17:12:56 +05:30 • committed by aksm-ms
commit b4fcf5d07d
2 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/main.js
View file

@ -36,7 +36,17 @@ function main() {
core.exportVariable('AZURE_HTTP_USER_AGENT', userAgentString); core.exportVariable('AZURE_HTTP_USER_AGENT', userAgentString);
core.exportVariable('AZUREPS_HOST_ENVIRONMENT', azurePSHostEnv); core.exportVariable('AZUREPS_HOST_ENVIRONMENT', azurePSHostEnv);
azPath = yield io.which("az", true); azPath = yield io.which("az", true);
yield executeAzCliCommand("--version"); let output = "";
const options = {
listeners: {
stdout: (data) => {
output += data.toString();
}
}
};
yield executeAzCliCommand("--version", true, options);
core.debug(`az cli version used:\n${output}`);
let creds = core.getInput('creds', { required: true }); let creds = core.getInput('creds', { required: true });
let secrets = new actions_secret_parser_1.SecretParser(creds, actions_secret_parser_1.FormatType.JSON); let secrets = new actions_secret_parser_1.SecretParser(creds, actions_secret_parser_1.FormatType.JSON);
let servicePrincipalId = secrets.getSecret("$.clientId", false); let servicePrincipalId = secrets.getSecret("$.clientId", false);
@ -45,6 +55,7 @@ function main() {
let subscriptionId = secrets.getSecret("$.subscriptionId", false); let subscriptionId = secrets.getSecret("$.subscriptionId", false);
const enableAzPSSession = core.getInput('enable-AzPSSession').toLowerCase() === "true"; const enableAzPSSession = core.getInput('enable-AzPSSession').toLowerCase() === "true";
const allowNoSubscriptionsLogin = core.getInput('allow-no-subscriptions').toLowerCase() === "true"; const allowNoSubscriptionsLogin = core.getInput('allow-no-subscriptions').toLowerCase() === "true";
if (!servicePrincipalId || !servicePrincipalKey || !tenantId) { if (!servicePrincipalId || !servicePrincipalKey || !tenantId) {
throw new Error("Not all values are present in the creds object. Ensure clientId, clientSecret and tenantId are supplied."); throw new Error("Not all values are present in the creds object. Ensure clientId, clientSecret and tenantId are supplied.");
} }
@ -85,10 +96,12 @@ function main() {
} }
}); });
} }
function executeAzCliCommand(command, silent) {
function executeAzCliCommand(command, silent, options = {}) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
options.silent = !!silent;
try { try {
yield exec.exec(`"${azPath}" ${command}`, [], { silent: !!silent }); yield exec.exec(`"${azPath}" ${command}`, [], options);
} }
catch (error) { catch (error) {
throw new Error(error); throw new Error(error);

16
src/main.ts
View file

@ -21,7 +21,16 @@ async function main() {
core.exportVariable('AZUREPS_HOST_ENVIRONMENT', azurePSHostEnv); core.exportVariable('AZUREPS_HOST_ENVIRONMENT', azurePSHostEnv);
azPath = await io.which("az", true); azPath = await io.which("az", true);
await executeAzCliCommand("--version"); let output: string = "";
const options: any = {
listeners: {
stdout: (data: Buffer) => {
output += data.toString();
}
}
};
await executeAzCliCommand("--version", true, options);
core.debug(`az cli version used:\n${output}`);
let creds = core.getInput('creds', { required: true }); let creds = core.getInput('creds', { required: true });
let secrets = new SecretParser(creds, FormatType.JSON); let secrets = new SecretParser(creds, FormatType.JSON);
@ -70,9 +79,10 @@ async function main() {
} }
} }
async function executeAzCliCommand(command: string, silent?: boolean) { async function executeAzCliCommand(command: string, silent?: boolean, options: any = {}) {
options.silent = !!silent;
try { try {
await exec.exec(`"${azPath}" ${command}`, [], {silent: !!silent}); await exec.exec(`"${azPath}" ${command}`, [], options);
} }
catch(error) { catch(error) {
throw new Error(error); throw new Error(error);