@argos-ci/core 5.0.1 → 5.0.2

package/dist/index.js

@@ -238,11 +238,13 @@ var heroku_default = service3;
 
 // src/ci-environment/services/github-actions.ts
 import { existsSync, readFileSync } from "fs";
-async function getPullRequestFromHeadSha({ env }, sha) {
-  debug("Fetching pull request number from head sha", sha);
+function getGitHubRepository({ env }) {
   if (!env.GITHUB_REPOSITORY) {
     throw new Error("GITHUB_REPOSITORY is missing");
   }
+  return env.GITHUB_REPOSITORY;
+}
+function getGitHubToken({ env }) {
   if (!env.GITHUB_TOKEN) {
     if (!env.DISABLE_GITHUB_TOKEN_WARNING) {
       console.log(
@@ -262,9 +264,39 @@ DISABLE_GITHUB_TOKEN_WARNING: true
     }
     return null;
   }
+  return env.GITHUB_TOKEN;
+}
+function getGhAPIHeaders(ctx) {
+  const githubToken = getGitHubToken(ctx);
+  if (!githubToken) {
+    return null;
+  }
+  return {
+    Accept: "application/vnd.github+json",
+    Authorization: `Bearer ${githubToken}`,
+    "X-GitHub-Api-Version": "2022-11-28"
+  };
+}
+async function fetchGitHubAPI(ctx, url) {
+  const headers = getGhAPIHeaders(ctx);
+  if (!headers) {
+    return null;
+  }
+  const response = await fetch(url, {
+    headers,
+    signal: AbortSignal.timeout(1e4)
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to fetch GitHub API: ${response.statusText}`);
+  }
+  return await response.json();
+}
+async function getPullRequestFromHeadSha(ctx, sha) {
+  debug("Fetching pull request details from head sha", sha);
+  const githubRepository = getGitHubRepository(ctx);
   try {
     const url = new URL(
-      `https://api.github.com/repos/${env.GITHUB_REPOSITORY}/pulls`
+      `https://api.github.com/repos/${githubRepository}/pulls`
     );
     url.search = new URLSearchParams({
       state: "open",
@@ -272,18 +304,10 @@ DISABLE_GITHUB_TOKEN_WARNING: true
       per_page: "30",
       page: "1"
     }).toString();
-    const response = await fetch(url, {
-      headers: {
-        Accept: "application/vnd.github+json",
-        Authorization: `Bearer ${process.env.GITHUB_TOKEN}`,
-        "X-GitHub-Api-Version": "2022-11-28"
-      },
-      signal: AbortSignal.timeout(1e4)
-    });
-    if (!response.ok) {
-      throw new Error(`Failed to fetch pull requests: ${response.statusText}`);
+    const result = await fetchGitHubAPI(ctx, url);
+    if (!result) {
+      return null;
     }
-    const result = await response.json();
     if (result.length === 0) {
       debug("Aborting because no pull request found");
       return null;
@@ -296,7 +320,27 @@ DISABLE_GITHUB_TOKEN_WARNING: true
     debug("Aborting because no pull request found");
     return null;
   } catch (error) {
-    debug("Error while fetching pull request from head sha", error);
+    debug("Error while fetching pull request details from head sha", error);
+    return null;
+  }
+}
+async function getPullRequestFromPrNumber(ctx, prNumber) {
+  debug("Fetching pull request details from pull request number", prNumber);
+  const githubRepository = getGitHubRepository(ctx);
+  const headers = getGhAPIHeaders(ctx);
+  if (!headers) {
+    return null;
+  }
+  try {
+    return await fetchGitHubAPI(
+      ctx,
+      `https://api.github.com/repos/${githubRepository}/pulls/${prNumber}`
+    );
+  } catch (error) {
+    debug(
+      "Error while fetching pull request details from pull request number",
+      error
+    );
     return null;
   }
 }
@@ -312,6 +356,14 @@ function getBranchFromContext(context) {
   const matches = branchRegex.exec(env.GITHUB_REF);
   return matches?.[1] ?? null;
 }
+function getPRNumberFromMergeGroupBranch(branch2) {
+  const prMatch = /queue\/[^/]*\/pr-(\d+)-/.exec(branch2);
+  if (prMatch) {
+    const prNumber = Number(prMatch[1]);
+    return prNumber;
+  }
+  return null;
+}
 function getBranchFromPayload(payload) {
   if ("workflow_run" in payload && payload.workflow_run) {
     return payload.workflow_run.head_branch;
@@ -386,7 +438,21 @@ var service4 = {
     const vercelPayload = getVercelDeploymentPayload(payload);
     const mergeGroupPayload = getMergeGroupPayload(payload);
     const sha = getSha(context, vercelPayload);
-    const pullRequest = payload && !vercelPayload ? getPullRequestFromPayload(payload) : await getPullRequestFromHeadSha(context, sha);
+    const pullRequest = await (() => {
+      if (vercelPayload || !payload) {
+        return getPullRequestFromHeadSha(context, sha);
+      }
+      if (mergeGroupPayload) {
+        const prNumber = getPRNumberFromMergeGroupBranch(
+          mergeGroupPayload.merge_group.head_ref
+        );
+        if (!prNumber) {
+          return null;
+        }
+        return getPullRequestFromPrNumber(context, prNumber);
+      }
+      return getPullRequestFromPayload(payload);
+    })();
     return {
       commit: sha,
       repository: getRepository3(context, payload),
@@ -395,7 +461,7 @@ var service4 = {
       runId: env.GITHUB_RUN_ID || null,
       runAttempt: env.GITHUB_RUN_ATTEMPT ? Number(env.GITHUB_RUN_ATTEMPT) : null,
       nonce: `${env.GITHUB_RUN_ID}-${env.GITHUB_RUN_ATTEMPT}`,
-      branch: vercelPayload?.client_payload?.git?.ref || getBranchFromContext(context) || pullRequest?.head.ref || (payload ? getBranchFromPayload(payload) : null) || null,
+      branch: (mergeGroupPayload ? pullRequest?.head.ref : null) || vercelPayload?.client_payload?.git?.ref || getBranchFromContext(context) || pullRequest?.head.ref || (payload ? getBranchFromPayload(payload) : null) || null,
       prNumber: pullRequest?.number || null,
       prHeadCommit: pullRequest?.head.sha ?? null,
       prBaseBranch: pullRequest?.base.ref ?? null,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@argos-ci/core",
   "description": "Node.js SDK for visual testing with Argos.",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "type": "module",
   "main": "./dist/index.cjs",
   "exports": {
@@ -67,5 +67,5 @@
     "lint": "eslint .",
     "test": "vitest"
   },
-  "gitHead": "389e8ae7fe5cd4bf74d2627853b8c62e4b09e86a"
+  "gitHead": "c0561c96e1f820633037a87448791f4ed57e086a"
 }

package/LICENSE

@@ -1,7 +0,0 @@
-Copyright 2022 Smooth Code
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.