Merge pull request #2 from mitchell-codecov/anomiex-fix/use-octokit-p…

…agination Merge dorny#129
mitchell-codecov · Jun 15, 2022 · 370fff3 · 370fff3
2 parents 8c7f485 + a09d4a5
commit 370fff3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 25 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -657,23 +657,17 @@ async function getChangedFilesFromApi(token, prNumber) {
         const client = new github.GitHub(token);
         const per_page = 100;
         const files = [];
-        for (let page = 1;; page++) {
-            core.info(`Invoking listFiles(pull_number: ${prNumber.number}, page: ${page}, per_page: ${per_page})`);
-            const response = await client.pulls.listFiles({
-                owner: github.context.repo.owner,
-                repo: github.context.repo.repo,
-                pull_number: prNumber.number,
-                per_page,
-                page
-            });
+        core.info(`Invoking listFiles(pull_number: ${prNumber.number}, per_page: ${per_page})`);
+        for await (const response of client.paginate.iterator(client.pulls.listFiles.endpoint.merge({
+            owner: github.context.repo.owner,
+            repo: github.context.repo.repo,
+            pull_number: prNumber.number,
+            per_page
+        }))) {
             if (response.status !== 200) {
                 throw new Error(`Fetching list of changed files from GitHub API failed with error code ${response.status}`);
             }
             core.info(`Received ${response.data.length} items`);
-            if (response.data.length === 0) {
-                core.info('All changed files has been fetched from GitHub API');
-                break;
-            }
             for (const row of response.data) {
                 core.info(`[${row.status}] ${row.filename}`);
                 // There's no obvious use-case for detection of renames
@@ -36234,4 +36228,4 @@ module.exports = JSON.parse('[[[0,44],"disallowed_STD3_valid"],[[45,46],"valid"]
 /******/ 	module.exports = __webpack_exports__;
 /******/ 	
 /******/ })()
-;
+;
diff --git a/src/main.ts b/src/main.ts
@@ -166,26 +166,20 @@ async function getChangedFilesFromApi(
     const per_page = 100
     const files: File[] = []
 
-    for (let page = 1; ; page++) {
-      core.info(`Invoking listFiles(pull_number: ${prNumber.number}, page: ${page}, per_page: ${per_page})`)
-      const response = await client.pulls.listFiles({
+    core.info(`Invoking listFiles(pull_number: ${prNumber.number}, per_page: ${per_page})`)
+    for await (const response of client.paginate.iterator(
+      client.pulls.listFiles.endpoint.merge({
         owner: github.context.repo.owner,
         repo: github.context.repo.repo,
         pull_number: prNumber.number,
-        per_page,
-        page
+        per_page
       })
-
+    )) {
       if (response.status !== 200) {
         throw new Error(`Fetching list of changed files from GitHub API failed with error code ${response.status}`)
       }
 
       core.info(`Received ${response.data.length} items`)
-      if (response.data.length === 0) {
-        core.info('All changed files has been fetched from GitHub API')
-        break
-      }
-
       for (const row of response.data) {
         core.info(`[${row.status}] ${row.filename}`)
         // There's no obvious use-case for detection of renames