Try to reduce API calls in check_artifact_exists

tarekeldeeb · Apr 27, 2021 · d183c26 · d183c26
1 parent 4a73246
commit d183c26
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 62 deletions.
diff --git a/.github/actions/check_artifact_exists/dist/index.js b/.github/actions/check_artifact_exists/dist/index.js
@@ -15,49 +15,28 @@ const { throttling } = __nccwpck_require__(9968);
 const { GitHub } = __nccwpck_require__(3030);
 
 async function getGoodArtifacts(client, owner, repo, name) {
-    const goodWorkflowArtifacts = await client.paginate(
-        "GET /repos/{owner}/{repo}/actions/runs/{run_id}/artifacts",
-        {
-            owner: owner,
-            repo: repo,
-            run_id: github.context.runId,
-        },
-        (workflowArtifacts) => {
-            // console.log(" ==> workflowArtifacts", workflowArtifacts);
-            return workflowArtifacts.data.filter((a) => {
-                // console.log("==> Artifact check", a);
-                return a.name == name
-            })
-        }
-    );
-
-    console.log("==> maybe goodWorkflowArtifacts:", goodWorkflowArtifacts);
-    if (goodWorkflowArtifacts.length > 0) {
-        return goodWorkflowArtifacts;
-    }
-
     const goodRepoArtifacts = await client.paginate(
         "GET /repos/{owner}/{repo}/actions/artifacts",
         {
             owner: owner,
             repo: repo,
+            per_page: 100,
         },
-        (repoArtifacts) => {
+        (repoArtifacts, done) => {
             // console.log(" ==> repoArtifacts", repoArtifacts);
-            return repoArtifacts.data.filter((a) => {
+            const goodArtifacts = repoArtifacts.data.filter((a) => {
                 // console.log("==> Artifact check", a);
                 return a.name == name
-            })
+            });
+            if (goodArtifacts.length > 0) {
+                done();
+            }
+            return goodArtifacts;
         }
     );
 
     console.log("==> maybe goodRepoArtifacts:", goodRepoArtifacts);
-    if (goodRepoArtifacts.length > 0) {
-        return goodRepoArtifacts;
-    }
-
-    // We have not been able to find a repo artifact, it's really no good news
-    return [];
+    return goodRepoArtifacts;
 }
 
 async function main() {

diff --git a/.github/actions/check_artifact_exists/main.js b/.github/actions/check_artifact_exists/main.js
@@ -8,49 +8,28 @@ const { throttling } = require('@octokit/plugin-throttling');
 const { GitHub } = require('@actions/github/lib/utils');
 
 async function getGoodArtifacts(client, owner, repo, name) {
-    const goodWorkflowArtifacts = await client.paginate(
-        "GET /repos/{owner}/{repo}/actions/runs/{run_id}/artifacts",
-        {
-            owner: owner,
-            repo: repo,
-            run_id: github.context.runId,
-        },
-        (workflowArtifacts) => {
-            // console.log(" ==> workflowArtifacts", workflowArtifacts);
-            return workflowArtifacts.data.filter((a) => {
-                // console.log("==> Artifact check", a);
-                return a.name == name
-            })
-        }
-    );
-
-    console.log("==> maybe goodWorkflowArtifacts:", goodWorkflowArtifacts);
-    if (goodWorkflowArtifacts.length > 0) {
-        return goodWorkflowArtifacts;
-    }
-
     const goodRepoArtifacts = await client.paginate(
         "GET /repos/{owner}/{repo}/actions/artifacts",
         {
             owner: owner,
             repo: repo,
+            per_page: 100,
         },
-        (repoArtifacts) => {
+        (repoArtifacts, done) => {
             // console.log(" ==> repoArtifacts", repoArtifacts);
-            return repoArtifacts.data.filter((a) => {
+            const goodArtifacts = repoArtifacts.data.filter((a) => {
                 // console.log("==> Artifact check", a);
                 return a.name == name
-            })
+            });
+            if (goodArtifacts.length > 0) {
+                done();
+            }
+            return goodArtifacts;
         }
     );
 
     console.log("==> maybe goodRepoArtifacts:", goodRepoArtifacts);
-    if (goodRepoArtifacts.length > 0) {
-        return goodRepoArtifacts;
-    }
-
-    // We have not been able to find a repo artifact, it's really no good news
-    return [];
+    return goodRepoArtifacts;
 }
 
 async function main() {

diff --git a/.github/actions/check_artifact_exists/package-lock.json b/.github/actions/check_artifact_exists/package-lock.json