Skip to content

adding az cli version debug logs (#76) #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aksm-ms merged 1 commit into from
Nov 3, 2020
Merged

adding az cli version debug logs (#76) #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,17 @@ function main() {
core.exportVariable('AZURE_HTTP_USER_AGENT', userAgentString);
core.exportVariable('AZUREPS_HOST_ENVIRONMENT', azurePSHostEnv);
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 secrets = new actions_secret_parser_1.SecretParser(creds, actions_secret_parser_1.FormatType.JSON);
let servicePrincipalId = secrets.getSecret("$.clientId", false);
Expand All @@ -45,6 +55,7 @@ function main() {
let subscriptionId = secrets.getSecret("$.subscriptionId", false);
const enableAzPSSession = core.getInput('enable-AzPSSession').toLowerCase() === "true";
const allowNoSubscriptionsLogin = core.getInput('allow-no-subscriptions').toLowerCase() === "true";

if (!servicePrincipalId || !servicePrincipalKey || !tenantId) {
throw new Error("Not all values are present in the creds object. Ensure clientId, clientSecret and tenantId are supplied.");
}
Expand Down Expand Up @@ -85,10 +96,12 @@ function main() {
}
});
}
function executeAzCliCommand(command, silent) {

function executeAzCliCommand(command, silent, options = {}) {
return __awaiter(this, void 0, void 0, function* () {
options.silent = !!silent;
try {
yield exec.exec(`"${azPath}" ${command}`, [], { silent: !!silent });
yield exec.exec(`"${azPath}" ${command}`, [], options);
}
catch (error) {
throw new Error(error);
Expand Down
20 changes: 15 additions & 5 deletions src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,17 @@ async function main() {
core.exportVariable('AZUREPS_HOST_ENVIRONMENT', azurePSHostEnv);

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 secrets = new SecretParser(creds, FormatType.JSON);
let servicePrincipalId = secrets.getSecret("$.clientId", false);
Expand Down Expand Up @@ -70,13 +79,14 @@ async function main() {
}
}

async function executeAzCliCommand(command: string, silent?: boolean) {
async function executeAzCliCommand(command: string, silent?: boolean, options: any = {}) {
options.silent = !!silent;
try {
await exec.exec(`"${azPath}" ${command}`, [], {silent: !!silent});
await exec.exec(`"${azPath}" ${command}`, [], options);
}
catch(error) {
throw new Error(error);
}
}

main();
main();