Upgrade got (github#28617)

* Upgrade got

* Update e2etest.js

* Skip following redirects on redirect tests

* Update deprecated-enterprise-versions.js

Author: heiskr

lib/failbot.js

@@ -10,7 +10,9 @@ async function retryingGot(url, args) {
       // With the timeout at 3000 (milliseconds) and the retry.limit
       // at 4 (times), the total worst-case is:
       // 3000 * 4  + 1000 + 2000 + 3000 + 4000 + 8000 = 30 seconds
-      timeout: 3000,
+      timeout: {
+        response: 3000,
+      },
       retry: {
         // This means it will wait...
         // 1. 1000ms

lib/hydro.js

@@ -106,7 +106,9 @@ export default class Hydro {
         // Because we prefer to handle the status code manually below
         throwHttpErrors: false,
         // The default is no timeout.
-        timeout: POST_TIMEOUT_MS,
+        timeout: {
+          response: POST_TIMEOUT_MS,
+        },
         agent: {
           // Deliberately not setting up a `http` or `http2` agent
           // because it won't be used for this particular `got` request.

middleware/archived-enterprise-versions.js

@@ -72,13 +72,11 @@ const cacheAggressively = (res) => {
 // Our own timeout, in ./middleware/timeout.js defaults to 10 seconds.
 // So there's no point in trying more attempts than 3 because it would
 // just timeout on the 10s. (i.e. 1000 + 2000 + 4000 + 8000 > 10,000)
-const retryConfiguration = {
-  limit: 3,
-}
+const retryConfiguration = { limit: 3 }
 // According to our Datadog metrics, the *average* time for the
 // the 'archive_enterprise_proxy' metric is ~70ms (excluding spikes)
 // which much less than 500ms.
-const timeoutConfiguration = 500
+const timeoutConfiguration = { response: 500 }
 
 async function getRemoteJSON(url, config) {
   if (_getRemoteJSONCache.has(url)) {
@@ -121,7 +119,7 @@ export default async function archivedEnterpriseVersions(req, res, next) {
       // useful because it caches so well.
       // And, as of 2021 that `redirects.json` is 10MB so it's more likely
       // to time out.
-      timeout: 1000,
+      timeout: { response: 1000 },
     })
     const [language, withoutLanguage] = splitPathByLanguage(req.path, req.context.userLanguage)
     const newRedirectTo = redirectJson[withoutLanguage]
@@ -182,7 +180,7 @@ export default async function archivedEnterpriseVersions(req, res, next) {
       // useful because it caches so well.
       // And, as of 2021 that `redirects.json` is 10MB so it's more likely
       // to time out.
-      timeout: 1000,
+      timeout: { response: 1000 },
     })
 
     // make redirects found via redirects.json redirect with a 301

package-lock.json

@@ -29,7 +29,7 @@
     "express-timeout-handler": "^2.2.2",
     "flat": "^5.0.2",
     "github-slugger": "^1.4.0",
-    "got": "^11.8.5",
+    "got": "^12.1.0",
     "gray-matter": "^4.0.3",
     "hast-util-from-parse5": "^7.1.0",
     "hast-util-parse-selector": "^3.1.0",

package.json

@@ -1,5 +1,6 @@
 import cheerio from 'cheerio'
 import got from 'got'
+import { omitBy, isUndefined } from 'lodash-es'
 
 export async function get(
   route,
@@ -16,14 +17,18 @@ export async function get(
   const fn = got[method]
   if (!fn || typeof fn !== 'function') throw new Error(`No method function for '${method}'`)
   const absURL = `http://localhost:4000${route}`
-  const res = await fn(absURL, {
-    body: opts.body,
-    headers: opts.headers,
-    retry: { limit: 0 },
-    cookieJar: opts.cookieJar,
-    throwHttpErrors: false,
-    followRedirect: opts.followAllRedirects || opts.followRedirects,
-  })
+  const xopts = omitBy(
+    {
+      body: opts.body,
+      headers: opts.headers,
+      retry: { limit: 0 },
+      cookieJar: opts.cookieJar,
+      throwHttpErrors: false,
+      followRedirect: opts.followAllRedirects || opts.followRedirects,
+    },
+    isUndefined
+  )
+  const res = await fn(absURL, xopts)
   // follow all redirects, or just follow one
   if (opts.followAllRedirects && [301, 302].includes(res.status)) {
     // res = await get(res.headers.location, opts)

tests/helpers/e2etest.js

@@ -613,7 +613,7 @@ describe('server', () => {
 
   describe('redirects', () => {
     test('redirects old articles to their English URL', async () => {
-      const res = await get('/articles/deleting-a-team')
+      const res = await get('/articles/deleting-a-team', { followRedirects: false })
       expect(res.statusCode).toBe(302)
       expect(res.headers['set-cookie']).toBeUndefined()
       // no cache control because a language prefix had to be injected
@@ -642,6 +642,7 @@ describe('server', () => {
             headers: {
               'accept-language': `${languageKey}`,
             },
+            followRedirects: false,
           })
           expect(res.statusCode).toBe(302)
           expect(res.headers.location).toBe(`/${languageKey}`)
@@ -661,6 +662,7 @@ describe('server', () => {
         headers: {
           'accept-language': 'ldfir;',
         },
+        followRedirects: false,
       })
 
       expect(res.statusCode).toBe(302)
@@ -675,6 +677,7 @@ describe('server', () => {
           // Tagalog: https://www.loc.gov/standards/iso639-2/php/langcodes_name.php?iso_639_1=tl
           'accept-language': 'tl',
         },
+        followRedirects: false,
       })
       expect(res.statusCode).toBe(302)
       expect(res.headers.location).toBe('/en')