artifact-provider: improve logging

This commit is contained in:
Michal Dorner 2021-02-15 20:46:28 +01:00
parent da9cc2c0d9
commit 1ae86a176d
No known key found for this signature in database
GPG key ID: 9EEE04B48DA36786
4 changed files with 65 additions and 35 deletions

53
dist/index.js generated vendored
View file

@ -85,22 +85,37 @@ class ArtifactProvider {
return {}; return {};
} }
for (const art of artifacts) { for (const art of artifacts) {
await github_utils_1.downloadArtifact(this.octokit, art.id, art.name, this.token); const fileName = `${art.name}.zip`;
const reportName = this.getReportName(art.name); await github_utils_1.downloadArtifact(this.octokit, art.id, fileName, art.size_in_bytes, this.token);
const files = []; core.startGroup(`Reading archive ${fileName}`);
const zip = new adm_zip_1.default(art.name); try {
for (const entry of zip.getEntries()) { const reportName = this.getReportName(art.name);
const file = entry.name; core.info(`Report name: ${reportName}`);
if (entry.isDirectory || !this.fileNameMatch(file)) const files = [];
continue; const zip = new adm_zip_1.default(fileName);
const content = zip.readAsText(entry); for (const entry of zip.getEntries()) {
files.push({ file, content }); const file = entry.name;
if (entry.isDirectory) {
core.info(`Skipping ${file}: entry is a directory`);
continue;
}
if (!this.fileNameMatch(file)) {
core.info(`Skipping ${file}: filename does not match pattern`);
continue;
}
const content = zip.readAsText(entry);
files.push({ file, content });
core.info(`Read ${file}: ${content.length} chars`);
}
if (result[reportName]) {
result[reportName].push(...files);
}
else {
result[reportName] = files;
}
} }
if (result[reportName]) { finally {
result[reportName].push(...files); core.endGroup();
}
else {
result[reportName] = files;
} }
} }
return result; return result;
@ -1370,7 +1385,7 @@ function getCheckRunContext() {
return { sha: github.context.sha, runId }; return { sha: github.context.sha, runId };
} }
exports.getCheckRunContext = getCheckRunContext; exports.getCheckRunContext = getCheckRunContext;
async function downloadArtifact(octokit, artifactId, fileName, token) { async function downloadArtifact(octokit, artifactId, fileName, size, token) {
core.startGroup(`Downloading artifact ${fileName}`); core.startGroup(`Downloading artifact ${fileName}`);
try { try {
core.info(`Artifact ID: ${artifactId}`); core.info(`Artifact ID: ${artifactId}`);
@ -1402,9 +1417,9 @@ async function downloadArtifact(octokit, artifactId, fileName, token) {
const downloadStream = got_1.default.stream(url, { headers }); const downloadStream = got_1.default.stream(url, { headers });
const fileWriterStream = fs_1.createWriteStream(fileName); const fileWriterStream = fs_1.createWriteStream(fileName);
core.info(`Downloading ${url}`); core.info(`Downloading ${url}`);
downloadStream.on('downloadProgress', ({ transferred, total, percent }) => { downloadStream.on('downloadProgress', ({ transferred }) => {
const percentage = Math.round(percent * 100); const percentage = Math.round(transferred / size * 100);
core.info(`Progress: ${transferred}/${total} (${percentage}%)`); core.info(`Progress: ${transferred}/${size} (${percentage}%)`);
}); });
await asyncStream(downloadStream, fileWriterStream); await asyncStream(downloadStream, fileWriterStream);
} }

2
dist/index.js.map generated vendored

File diff suppressed because one or more lines are too long

View file

@ -67,20 +67,35 @@ export class ArtifactProvider implements InputProvider {
} }
for (const art of artifacts) { for (const art of artifacts) {
await downloadArtifact(this.octokit, art.id, art.name, art.size_in_bytes, this.token) const fileName = `${art.name}.zip`
const reportName = this.getReportName(art.name) await downloadArtifact(this.octokit, art.id, fileName, art.size_in_bytes, this.token)
const files: FileContent[] = [] core.startGroup(`Reading archive ${fileName}`)
const zip = new Zip(art.name) try {
for (const entry of zip.getEntries()) { const reportName = this.getReportName(art.name)
const file = entry.name core.info(`Report name: ${reportName}`)
if (entry.isDirectory || !this.fileNameMatch(file)) continue const files: FileContent[] = []
const content = zip.readAsText(entry) const zip = new Zip(fileName)
files.push({file, content}) for (const entry of zip.getEntries()) {
} const file = entry.name
if (result[reportName]) { if (entry.isDirectory) {
result[reportName].push(...files) core.info(`Skipping ${file}: entry is a directory`)
} else { continue
result[reportName] = files }
if (!this.fileNameMatch(file)) {
core.info(`Skipping ${file}: filename does not match pattern`)
continue
}
const content = zip.readAsText(entry)
files.push({file, content})
core.info(`Read ${file}: ${content.length} chars`)
}
if (result[reportName]) {
result[reportName].push(...files)
} else {
result[reportName] = files
}
} finally {
core.endGroup()
} }
} }

View file

@ -74,7 +74,7 @@ export async function downloadArtifact(
core.info(`Downloading ${url}`) core.info(`Downloading ${url}`)
downloadStream.on('downloadProgress', ({transferred}) => { downloadStream.on('downloadProgress', ({transferred}) => {
const percentage = Math.round(transferred / size * 100) const percentage = Math.round((transferred / size) * 100)
core.info(`Progress: ${transferred}/${size} (${percentage}%)`) core.info(`Progress: ${transferred}/${size} (${percentage}%)`)
}) })
await asyncStream(downloadStream, fileWriterStream) await asyncStream(downloadStream, fileWriterStream)