From 05620dd2b74e96acc452fe69293fcf67fa33e8f6 Mon Sep 17 00:00:00 2001 From: jpaul Date: Tue, 14 Nov 2023 15:22:43 +0100 Subject: [PATCH] add logging for debugging --- dist/cleanup/index.js | 28 ++++++++++++++++------------ dist/main/index.js | 28 ++++++++++++++++------------ src/utils.ts | 30 ++++++++++++++++++------------ 3 files changed, 50 insertions(+), 36 deletions(-) diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index d4977e9..68b09ba 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -74982,11 +74982,11 @@ function getPrBaseBranchMetrics() { }); const baseCommitSha = yield getBaseBranchCommitSha(octokit, context); core.info(baseCommitSha); - const blobTreeUrl = yield getBlobTreeUrl(octokit, context, baseCommitSha); - core.info(blobTreeUrl); - const blobUrl = yield getBlobUrl(octokit, context, blobTreeUrl); - core.info(blobUrl); - const blobContent = yield getBlobContent(octokit, context, blobUrl); + const blobTreeSha = yield getBlobTreeSha(octokit, context, baseCommitSha); + core.info(blobTreeSha); + const blobSha = yield getBlobSha(octokit, context, blobTreeSha); + core.info(blobSha); + const blobContent = yield getBlobContent(octokit, context, blobSha); core.info(blobContent); return blobContent; }); @@ -74999,30 +74999,34 @@ function getBaseBranchCommitSha(octokit, context) { const { data } = yield octokit.request(`GET /repos/${context.repo.owner}/${context.repo.repo}/ref/heads/${prBaseSha}`, Object.assign(Object.assign({}, context.repo), { headers: { 'X-GitHub-Api-Version': '2022-11-28' } })); + core.info(data); return data.object.sha; }); } -function getBlobTreeUrl(octokit, context, baseCommitSha) { +function getBlobTreeSha(octokit, context, baseCommitSha) { return __awaiter(this, void 0, void 0, function* () { const { data } = yield octokit.request(`GET /repos/${context.repo.owner}/${context.repo.repo}/ref/metrics/${baseCommitSha}`, Object.assign(Object.assign({}, context.repo), { headers: { 'X-GitHub-Api-Version': '2022-11-28' } })); - return data.object.url; + core.info(data); + return data.object.sha; }); } -function getBlobUrl(octokit, context, blobTreeUrl) { +function getBlobSha(octokit, context, blobTreeSha) { return __awaiter(this, void 0, void 0, function* () { - const { data } = yield octokit.request(blobTreeUrl, Object.assign(Object.assign({}, context.repo), { headers: { + const { data } = yield octokit.request(`GET /repos/${context.repo.owner}/git/trees/${blobTreeSha}`, Object.assign(Object.assign({}, context.repo), { tree_sha: blobTreeSha, headers: { 'X-GitHub-Api-Version': '2022-11-28' } })); - return data.tree[0].url; + core.info(data); + return data.tree[0].sha; }); } -function getBlobContent(octokit, context, blobUrl) { +function getBlobContent(octokit, context, blobSha) { return __awaiter(this, void 0, void 0, function* () { - const { data } = yield octokit.request(blobUrl, Object.assign(Object.assign({}, context.repo), { headers: { + const { data } = yield octokit.request(`GET /repos/${context.repo.owner}/git/blobs/${blobSha}`, Object.assign(Object.assign({}, context.repo), { file_sha: blobSha, headers: { 'X-GitHub-Api-Version': '2022-11-28' } })); + core.info(data); return js_base64_1.Base64.decode(data.content); }); } diff --git a/dist/main/index.js b/dist/main/index.js index c7f38bc..ed26e83 100644 --- a/dist/main/index.js +++ b/dist/main/index.js @@ -75979,11 +75979,11 @@ function getPrBaseBranchMetrics() { }); const baseCommitSha = yield getBaseBranchCommitSha(octokit, context); core.info(baseCommitSha); - const blobTreeUrl = yield getBlobTreeUrl(octokit, context, baseCommitSha); - core.info(blobTreeUrl); - const blobUrl = yield getBlobUrl(octokit, context, blobTreeUrl); - core.info(blobUrl); - const blobContent = yield getBlobContent(octokit, context, blobUrl); + const blobTreeSha = yield getBlobTreeSha(octokit, context, baseCommitSha); + core.info(blobTreeSha); + const blobSha = yield getBlobSha(octokit, context, blobTreeSha); + core.info(blobSha); + const blobContent = yield getBlobContent(octokit, context, blobSha); core.info(blobContent); return blobContent; }); @@ -75996,30 +75996,34 @@ function getBaseBranchCommitSha(octokit, context) { const { data } = yield octokit.request(`GET /repos/${context.repo.owner}/${context.repo.repo}/ref/heads/${prBaseSha}`, Object.assign(Object.assign({}, context.repo), { headers: { 'X-GitHub-Api-Version': '2022-11-28' } })); + core.info(data); return data.object.sha; }); } -function getBlobTreeUrl(octokit, context, baseCommitSha) { +function getBlobTreeSha(octokit, context, baseCommitSha) { return __awaiter(this, void 0, void 0, function* () { const { data } = yield octokit.request(`GET /repos/${context.repo.owner}/${context.repo.repo}/ref/metrics/${baseCommitSha}`, Object.assign(Object.assign({}, context.repo), { headers: { 'X-GitHub-Api-Version': '2022-11-28' } })); - return data.object.url; + core.info(data); + return data.object.sha; }); } -function getBlobUrl(octokit, context, blobTreeUrl) { +function getBlobSha(octokit, context, blobTreeSha) { return __awaiter(this, void 0, void 0, function* () { - const { data } = yield octokit.request(blobTreeUrl, Object.assign(Object.assign({}, context.repo), { headers: { + const { data } = yield octokit.request(`GET /repos/${context.repo.owner}/git/trees/${blobTreeSha}`, Object.assign(Object.assign({}, context.repo), { tree_sha: blobTreeSha, headers: { 'X-GitHub-Api-Version': '2022-11-28' } })); - return data.tree[0].url; + core.info(data); + return data.tree[0].sha; }); } -function getBlobContent(octokit, context, blobUrl) { +function getBlobContent(octokit, context, blobSha) { return __awaiter(this, void 0, void 0, function* () { - const { data } = yield octokit.request(blobUrl, Object.assign(Object.assign({}, context.repo), { headers: { + const { data } = yield octokit.request(`GET /repos/${context.repo.owner}/git/blobs/${blobSha}`, Object.assign(Object.assign({}, context.repo), { file_sha: blobSha, headers: { 'X-GitHub-Api-Version': '2022-11-28' } })); + core.info(data); return js_base64_1.Base64.decode(data.content); }); } diff --git a/src/utils.ts b/src/utils.ts index 4c8102c..817df1a 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -256,11 +256,11 @@ export async function getPrBaseBranchMetrics(): Promise { }) const baseCommitSha = await getBaseBranchCommitSha(octokit, context) core.info(baseCommitSha) - const blobTreeUrl = await getBlobTreeUrl(octokit, context, baseCommitSha) - core.info(blobTreeUrl) - const blobUrl = await getBlobUrl(octokit, context, blobTreeUrl) - core.info(blobUrl) - const blobContent = await getBlobContent(octokit, context, blobUrl) + const blobTreeSha = await getBlobTreeSha(octokit, context, baseCommitSha) + core.info(blobTreeSha) + const blobSha = await getBlobSha(octokit, context, blobTreeSha) + core.info(blobSha) + const blobContent = await getBlobContent(octokit, context, blobSha) core.info(blobContent) return blobContent } @@ -274,35 +274,41 @@ async function getBaseBranchCommitSha(octokit: Octokit, context: Context): Promi 'X-GitHub-Api-Version': '2022-11-28' } }) + core.info(data) return data.object.sha } -async function getBlobTreeUrl(octokit: Octokit, context: Context, baseCommitSha: string): Promise { +async function getBlobTreeSha(octokit: Octokit, context: Context, baseCommitSha: string): Promise { const { data } = await octokit.request(`GET /repos/${context.repo.owner}/${context.repo.repo}/ref/metrics/${baseCommitSha}`, { ...context.repo, headers: { 'X-GitHub-Api-Version': '2022-11-28' } }) - return data.object.url + core.info(data) + return data.object.sha } -async function getBlobUrl(octokit: Octokit, context: Context, blobTreeUrl: string) { - const { data } = await octokit.request(blobTreeUrl, { +async function getBlobSha(octokit: Octokit, context: Context, blobTreeSha: string) { + const { data } = await octokit.request(`GET /repos/${context.repo.owner}/git/trees/${blobTreeSha}`, { ...context.repo, + tree_sha: blobTreeSha, headers: { 'X-GitHub-Api-Version': '2022-11-28' } }) - return data.tree[0].url + core.info(data) + return data.tree[0].sha } -async function getBlobContent(octokit: Octokit, context: Context, blobUrl: string) { - const { data } = await octokit.request(blobUrl, { +async function getBlobContent(octokit: Octokit, context: Context, blobSha: string) { + const { data } = await octokit.request(`GET /repos/${context.repo.owner}/git/blobs/${blobSha}`, { ...context.repo, + file_sha: blobSha, headers: { 'X-GitHub-Api-Version': '2022-11-28' } }) + core.info(data) return Base64.decode(data.content) } \ No newline at end of file