Merge pull request #32896 from github/repo-sync

Repo sync
github · May 9, 2024 · e939b9a · e939b9a
2 parents f20739e + 2afffab
commit e939b9a
Show file tree

Hide file tree

Showing 24 changed files with 12,892 additions and 765 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -213,13 +213,13 @@
     "cheerio-to-text": "0.2.4",
     "classnames": "^2.5.1",
     "connect-datadog": "0.0.9",
+    "connect-timeout": "1.9.0",
     "cookie-parser": "^1.4.6",
     "dayjs": "^1.11.3",
     "dotenv": "^16.4.5",
     "escape-string-regexp": "5.0.0",
     "express": "4.19.2",
     "express-rate-limit": "7.2.0",
-    "express-timeout-handler": "^2.2.2",
     "fastest-levenshtein": "1.0.16",
     "file-type": "19.0.0",
     "flat": "^6.0.1",
@@ -290,6 +290,7 @@
     "@graphql-tools/load": "^8.0.0",
     "@octokit/rest": "^20.1.0",
     "@playwright/test": "1.43.0",
+    "@types/connect-timeout": "0.0.39",
     "@types/express": "4.17.21",
     "@types/imurmurhash": "^0.1.4",
     "@types/js-cookie": "^3.0.6",

diff --git a/src/frame/middleware/index.ts b/src/frame/middleware/index.ts
@@ -3,10 +3,10 @@ import path from 'path'
 
 import express from 'express'
 import type { NextFunction, Request, Response, Express } from 'express'
+import timeout from 'connect-timeout'
 
 import { haltOnDroppedConnection } from './halt-on-dropped-connection'
 import abort from './abort'
-import timeout from './timeout.js'
 import morgan from 'morgan'
 import datadog from '@/observability/middleware/connect-datadog.js'
 import helmet from './helmet.js'
@@ -66,6 +66,7 @@ import dynamicAssets from '@/assets/middleware/dynamic-assets.js'
 import contextualizeSearch from '@/search/middleware/contextualize.js'
 import shielding from '@/shielding/middleware/index.js'
 import tracking from '@/tracking/middleware/index.js'
+import { MAX_REQUEST_TIMEOUT } from '@/frame/lib/constants.js'
 
 const { DEPLOYMENT_ENV, NODE_ENV } = process.env
 const isTest = NODE_ENV === 'test' || process.env.GITHUB_ACTIONS === 'true'
@@ -89,7 +90,7 @@ const asyncMiddleware = (fn: Function) => (req: Request, res: Response, next: Ne
 
 export default function (app: Express) {
   // *** Request connection management ***
-  if (!isTest) app.use(timeout)
+  if (!isTest) app.use(timeout(MAX_REQUEST_TIMEOUT))
   app.use(abort)
 
   // Don't use the proxy's IP, use the requester's for rate limiting or

diff --git a/src/frame/middleware/timeout.js b/src/frame/middleware/timeout.js
diff --git a/src/github-apps/data/fpt-2022-11-28/fine-grained-pat-permissions.json b/src/github-apps/data/fpt-2022-11-28/fine-grained-pat-permissions.json
@@ -309,15 +309,6 @@
         "additional-permissions": false,
         "access": "read"
       },
-      {
-        "category": "copilot",
-        "slug": "get-a-summary-of-copilot-usage-for-a-team",
-        "subcategory": "copilot-usage",
-        "verb": "get",
-        "requestPath": "/orgs/{org}/team/{team_slug}/copilot/usage",
-        "additional-permissions": true,
-        "access": "read"
-      },
       {
         "category": "orgs",
         "slug": "enable-or-disable-a-security-feature-for-an-organization",
@@ -590,15 +581,6 @@
         "requestPath": "/orgs/{org}/members/{username}/copilot",
         "additional-permissions": false,
         "access": "write"
-      },
-      {
-        "category": "copilot",
-        "slug": "get-a-summary-of-copilot-usage-for-a-team",
-        "subcategory": "copilot-usage",
-        "verb": "get",
-        "requestPath": "/orgs/{org}/team/{team_slug}/copilot/usage",
-        "additional-permissions": true,
-        "access": "write"
       }
     ]
   },
@@ -3888,6 +3870,33 @@
         "additional-permissions": false,
         "access": "read"
       },
+      {
+        "category": "code-scanning",
+        "slug": "create-a-codeql-variant-analysis",
+        "subcategory": "code-scanning",
+        "verb": "post",
+        "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/variant-analyses",
+        "additional-permissions": false,
+        "access": "write"
+      },
+      {
+        "category": "code-scanning",
+        "slug": "get-the-summary-of-a-codeql-variant-analysis",
+        "subcategory": "code-scanning",
+        "verb": "get",
+        "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/variant-analyses/{codeql_variant_analysis_id}",
+        "additional-permissions": false,
+        "access": "read"
+      },
+      {
+        "category": "code-scanning",
+        "slug": "get-the-analysis-status-of-a-repository-in-a-codeql-variant-analysis",
+        "subcategory": "code-scanning",
+        "verb": "get",
+        "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/variant-analyses/{codeql_variant_analysis_id}/repos/{repo_owner}/{repo_name}",
+        "additional-permissions": false,
+        "access": "read"
+      },
       {
         "category": "repos",
         "slug": "list-codeowners-errors",

diff --git a/src/github-apps/data/fpt-2022-11-28/fine-grained-pat.json b/src/github-apps/data/fpt-2022-11-28/fine-grained-pat.json
@@ -1346,6 +1346,24 @@
       "verb": "get",
       "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}"
     },
+    {
+      "slug": "create-a-codeql-variant-analysis",
+      "subcategory": "code-scanning",
+      "verb": "post",
+      "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/variant-analyses"
+    },
+    {
+      "slug": "get-the-summary-of-a-codeql-variant-analysis",
+      "subcategory": "code-scanning",
+      "verb": "get",
+      "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/variant-analyses/{codeql_variant_analysis_id}"
+    },
+    {
+      "slug": "get-the-analysis-status-of-a-repository-in-a-codeql-variant-analysis",
+      "subcategory": "code-scanning",
+      "verb": "get",
+      "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/variant-analyses/{codeql_variant_analysis_id}/repos/{repo_owner}/{repo_name}"
+    },
     {
       "slug": "get-a-code-scanning-default-setup-configuration",
       "subcategory": "code-scanning",
@@ -1877,12 +1895,6 @@
       "subcategory": "copilot-user-management",
       "verb": "get",
       "requestPath": "/orgs/{org}/members/{username}/copilot"
-    },
-    {
-      "slug": "get-a-summary-of-copilot-usage-for-a-team",
-      "subcategory": "copilot-usage",
-      "verb": "get",
-      "requestPath": "/orgs/{org}/team/{team_slug}/copilot/usage"
     }
   ],
   "dependabot": [

diff --git a/src/github-apps/data/fpt-2022-11-28/server-to-server-permissions.json b/src/github-apps/data/fpt-2022-11-28/server-to-server-permissions.json
@@ -394,17 +394,6 @@
         "server-to-server": true,
         "additional-permissions": false
       },
-      {
-        "category": "copilot",
-        "slug": "get-a-summary-of-copilot-usage-for-a-team",
-        "subcategory": "copilot-usage",
-        "verb": "get",
-        "requestPath": "/orgs/{org}/team/{team_slug}/copilot/usage",
-        "access": "read",
-        "user-to-server": true,
-        "server-to-server": true,
-        "additional-permissions": true
-      },
       {
         "category": "orgs",
         "slug": "enable-or-disable-a-security-feature-for-an-organization",
@@ -731,17 +720,6 @@
         "user-to-server": true,
         "server-to-server": true,
         "additional-permissions": false
-      },
-      {
-        "category": "copilot",
-        "slug": "get-a-summary-of-copilot-usage-for-a-team",
-        "subcategory": "copilot-usage",
-        "verb": "get",
-        "requestPath": "/orgs/{org}/team/{team_slug}/copilot/usage",
-        "access": "write",
-        "user-to-server": true,
-        "server-to-server": true,
-        "additional-permissions": true
       }
     ]
   },
@@ -4731,6 +4709,39 @@
         "server-to-server": true,
         "additional-permissions": false
       },
+      {
+        "category": "code-scanning",
+        "slug": "create-a-codeql-variant-analysis",
+        "subcategory": "code-scanning",
+        "verb": "post",
+        "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/variant-analyses",
+        "access": "write",
+        "user-to-server": true,
+        "server-to-server": true,
+        "additional-permissions": false
+      },
+      {
+        "category": "code-scanning",
+        "slug": "get-the-summary-of-a-codeql-variant-analysis",
+        "subcategory": "code-scanning",
+        "verb": "get",
+        "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/variant-analyses/{codeql_variant_analysis_id}",
+        "access": "read",
+        "user-to-server": true,
+        "server-to-server": true,
+        "additional-permissions": false
+      },
+      {
+        "category": "code-scanning",
+        "slug": "get-the-analysis-status-of-a-repository-in-a-codeql-variant-analysis",
+        "subcategory": "code-scanning",
+        "verb": "get",
+        "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/variant-analyses/{codeql_variant_analysis_id}/repos/{repo_owner}/{repo_name}",
+        "access": "read",
+        "user-to-server": true,
+        "server-to-server": true,
+        "additional-permissions": false
+      },
       {
         "category": "repos",
         "slug": "list-codeowners-errors",