Merge branch 'main' into refactor-release-signing-v2

Author: aditi-khare-mongoDB

.github/scripts/highlights.mjs

@@ -1,25 +1,22 @@
 // @ts-check
 import * as process from 'node:process';
-import { Octokit } from '@octokit/core';
 import { output } from './util.mjs';
 
 const {
   GITHUB_TOKEN = '',
   PR_LIST = '',
-  owner = 'mongodb',
-  repo = 'js-bson'
+  REPOSITORY = ''
 } = process.env;
 if (GITHUB_TOKEN === '') throw new Error('GITHUB_TOKEN cannot be empty');
+if (REPOSITORY === '') throw new Error('REPOSITORY cannot be empty')
 
-const octokit = new Octokit({
-  auth: GITHUB_TOKEN,
-  log: {
-    debug: msg => console.error('Octokit.debug', msg),
-    info: msg => console.error('Octokit.info', msg),
-    warn: msg => console.error('Octokit.warn', msg),
-    error: msg => console.error('Octokit.error', msg)
+const API_REQ_INFO = {
+  headers: {
+    Accept: 'application/vnd.github.v3+json',
+    'X-GitHub-Api-Version': '2022-11-28',
+    Authorization: `Bearer ${GITHUB_TOKEN}`
   }
-});
+}
 
 const prs = PR_LIST.split(',').map(pr => {
   const prNum = Number(pr);
@@ -35,13 +32,10 @@ async function getPullRequestContent(pull_number) {
 
   let body;
   try {
-    const res = await octokit.request('GET /repos/{owner}/{repo}/pulls/{pull_number}', {
-      owner,
-      repo,
-      pull_number,
-      headers: { 'X-GitHub-Api-Version': '2022-11-28' }
-    });
-    body = res.data.body;
+    const response = await fetch(new URL(`https://api.github.com/repos/${REPOSITORY}/pulls/${pull_number}`), API_REQ_INFO);
+    if (!response.ok) throw new Error(await response.text());
+    const pr = await response.json();
+    body = pr.body;
   } catch (error) {
     console.log(`Could not get PR ${pull_number}, skipping. ${error.status}`);
     return '';

.github/workflows/release-5.x.yml

@@ -61,7 +61,8 @@ jobs:
           aws_secret_id: ${{ secrets.aws_secret_id }}
 
       - name: "Generate Sarif Report"
-        uses: "alcaeus/drivers-github-tools/code-scanning-export@export-code-scanning-report"
+        # TODO: Use v2 once it has been re-tagged to include this action
+        uses: mongodb-labs/drivers-github-tools/code-scanning-export@main
         with:
           ref: 5.x
           output-file: sarif-report.json

.github/workflows/release.yml

@@ -59,7 +59,8 @@ jobs:
           aws_secret_id: ${{ secrets.aws_secret_id }}
 
       - name: "Generate Sarif Report"
-        uses: "alcaeus/drivers-github-tools/code-scanning-export@export-code-scanning-report"
+        # TODO: Use v2 once it has been re-tagged to include this action
+        uses: mongodb-labs/drivers-github-tools/code-scanning-export@main
         with:
           ref: main
           output-file: sarif-report.json

.github/workflows/release_notes.yml

@@ -64,6 +64,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
           PR_LIST: ${{ steps.pr_list.outputs.pr_list }}
+          REPOSITORY: ${{ github.repository }}
 
       # The combined output is available
       - id: release_notes

package-lock.json

@@ -28,7 +28,6 @@
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@microsoft/api-extractor": "^7.43.1",
-    "@octokit/core": "^6.1.2",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/chai": "^4.3.14",