Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repo sync #32896

Merged
merged 2 commits into from
May 9, 2024
Merged

Repo sync #32896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae87bd7
Port `timeout.js` to TypeScript (#50515)
peterbe May 9, 2024
2afffab
Update OpenAPI Description (#50541)
docs-bot May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 70 additions & 8 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions src/frame/middleware/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -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
Expand Down
37 changes: 0 additions & 37 deletions src/frame/middleware/timeout.js
View file
Open in desktop

This file was deleted.

45 changes: 27 additions & 18 deletions src/github-apps/data/fpt-2022-11-28/fine-grained-pat-permissions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
]
},
Expand Down Expand Up @@ -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",
Expand Down
24 changes: 18 additions & 6 deletions src/github-apps/data/fpt-2022-11-28/fine-grained-pat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": [
Expand Down
55 changes: 33 additions & 22 deletions src/github-apps/data/fpt-2022-11-28/server-to-server-permissions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
}
]
},
Expand Down Expand Up @@ -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",
Expand Down
Loading
Loading