Merge branch 'mschoettle-upgrade-octokit'

Author: spruce

Dockerfile

@@ -6,7 +6,7 @@
 #
 # If you're interested in testing other base images, take a look at this reference:
 # https://github.com/BretFisher/nodejs-rocks-in-docker
-FROM node:16-bullseye-slim
+FROM node:22-bullseye-slim
 
 ARG USERNAME=migrator
 ARG USER_UID=2000

package-lock.json

@@ -29,7 +29,7 @@
     "@gitbeaker/node": "^35.1.0",
     "@octokit/plugin-throttling": "^11.0.1",
     "@octokit/rest": "^21.1.1",
-    "@octokit/types": "^6.34.0",
+    "@octokit/types": "^13.8.0",
     "aws-sdk": "^2.1053.0",
     "axios": "^1.6.0",
     "mime-types": "^2.1.34",

package.json

@@ -68,21 +68,21 @@ const githubApi = new MyOctokit({
   },
   auth: 'token ' + settings.github.token,
   throttle: {
-    onRateLimit: async (retryAfter, options) => {
+    onRateLimit: async (retryAfter, options, octokit, retryCount) => {
       console.log(
         `Request quota exhausted for request ${options.method} ${options.url}`
       );
       console.log(`Retrying after ${retryAfter} seconds!`);
       return true;
     },
-    onAbuseLimit: async (retryAfter, options) => {
+    onSecondaryRateLimit: async (retryAfter, options, octokit, retryCount) => {
       console.log(
-        `Abuse detected for request ${options.method} ${options.url}`
-      );
+        `SecondaryRateLimit detected for request ${options.method} ${options.url}`
+      )
       console.log(`Retrying after ${retryAfter} seconds!`);
       return true;
     },
-    minimumAbuseRetryAfter: 1000,
+    fallbackSecondaryRateRetryAfter: 600,
   },
 });