diff --git a/lib/datasource/orb/__snapshots__/index.spec.ts.snap b/lib/datasource/orb/__snapshots__/index.spec.ts.snap index efeac7f74b2324bf7474a8baf64d5cc899643e02..aa763b07099deecd0d6f1c6adad1fc9bcaf9350c 100644 --- a/lib/datasource/orb/__snapshots__/index.spec.ts.snap +++ b/lib/datasource/orb/__snapshots__/index.spec.ts.snap @@ -71,7 +71,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 128, + "content-length": "128", "content-type": "application/json", "host": "circleci.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -153,7 +153,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 128, + "content-length": "128", "content-type": "application/json", "host": "circleci.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -185,7 +185,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 128, + "content-length": "128", "content-type": "application/json", "host": "circleci.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -217,7 +217,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 128, + "content-length": "128", "content-type": "application/json", "host": "circleci.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -249,7 +249,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 128, + "content-length": "128", "content-type": "application/json", "host": "circleci.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -281,7 +281,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 128, + "content-length": "128", "content-type": "application/json", "host": "circleci.com", "user-agent": "https://github.com/renovatebot/renovate", diff --git a/lib/datasource/packagist/index.ts b/lib/datasource/packagist/index.ts index 932bd6ef48f0d975c38b835253033818d5b2ec5a..5f6f89459ecb343526e6139abced54c7ad257326 100644 --- a/lib/datasource/packagist/index.ts +++ b/lib/datasource/packagist/index.ts @@ -23,7 +23,7 @@ function getHostOpts(url: string): HttpOptions { url, }); if (username && password) { - opts.auth = `${username}:${password}`; + Object.assign(opts, { username, password }); } return opts; } @@ -99,7 +99,7 @@ async function getPackagistFile( const { key, sha256 } = file; const fileName = key.replace('%hash%', sha256); const opts = getHostOpts(regUrl); - if (opts.auth || (opts.headers && opts.headers.authorization)) { + if (opts.password || opts.headers?.authorization) { return (await http.getJson<PackagistFile>(regUrl + '/' + fileName, opts)) .body; } diff --git a/lib/datasource/pod/index.ts b/lib/datasource/pod/index.ts index c91b3bfb84b28e48ac377be9f9f640abea4ba39c..2f925b127cad89619c6df9b06f5e5a1c32885c72 100644 --- a/lib/datasource/pod/index.ts +++ b/lib/datasource/pod/index.ts @@ -40,17 +40,15 @@ function releasesGithubUrl( function handleError(lookupName: string, err: HttpError): void { const errorData = { lookupName, err }; - if ( - err.statusCode === 429 || - (err.statusCode >= 500 && err.statusCode < 600) - ) { + const statusCode = err.response?.statusCode; + if (statusCode === 429 || (statusCode >= 500 && statusCode < 600)) { logger.warn({ lookupName, err }, `CocoaPods registry failure`); throw new ExternalHostError(err); } - if (err.statusCode === 401) { + if (statusCode === 401) { logger.debug(errorData, 'Authorization error'); - } else if (err.statusCode === 404) { + } else if (statusCode === 404) { logger.debug(errorData, 'Package lookup error'); } else { logger.warn(errorData, 'CocoaPods lookup failure: Unknown error'); diff --git a/lib/datasource/terraform-module/__snapshots__/index.spec.ts.snap b/lib/datasource/terraform-module/__snapshots__/index.spec.ts.snap index c898411c25f8c28f594b7dd342b21e265d4458ad..03209036e8454d36ec88f54d7ab42365e50431e6 100644 --- a/lib/datasource/terraform-module/__snapshots__/index.spec.ts.snap +++ b/lib/datasource/terraform-module/__snapshots__/index.spec.ts.snap @@ -106,6 +106,31 @@ Array [ `; exports[`datasource/terraform-module getReleases processes real data on changed subpath 1`] = ` +Array [ + Object { + "headers": Object { + "accept": "application/json", + "accept-encoding": "gzip, deflate", + "host": "terraform.foo.bar", + "user-agent": "https://github.com/renovatebot/renovate", + }, + "method": "GET", + "url": "https://terraform.foo.bar/.well-known/terraform.json", + }, + Object { + "headers": Object { + "accept": "application/json", + "accept-encoding": "gzip, deflate", + "host": "terraform.foo.bar", + "user-agent": "https://github.com/renovatebot/renovate", + }, + "method": "GET", + "url": "https://terraform.foo.bar/api/registry/v1/modules/hashicorp/consul/aws", + }, +] +`; + +exports[`datasource/terraform-module getReleases processes real data on changed subpath 2`] = ` Object { "name": "hashicorp/consul/aws", "releases": Array [ @@ -184,31 +209,6 @@ Object { } `; -exports[`datasource/terraform-module getReleases processes real data on changed subpath 2`] = ` -Array [ - Object { - "headers": Object { - "accept": "application/json", - "accept-encoding": "gzip, deflate", - "host": "terraform.foo.bar", - "user-agent": "https://github.com/renovatebot/renovate", - }, - "method": "GET", - "url": "https://terraform.foo.bar/.well-known/terraform.json", - }, - Object { - "headers": Object { - "accept": "application/json", - "accept-encoding": "gzip, deflate", - "host": "terraform.foo.bar", - "user-agent": "https://github.com/renovatebot/renovate", - }, - "method": "GET", - "url": "https://terraform.foo.bar/api/registry/v1/modules/hashicorp/consul/aws", - }, -] -`; - exports[`datasource/terraform-module getReleases processes with registry in name 1`] = ` Object { "homepage": "https://registry.terraform.io/modules/hashicorp/consul/aws", diff --git a/lib/datasource/terraform-module/index.spec.ts b/lib/datasource/terraform-module/index.spec.ts index 931520dc74b03fb9b8acd071f88d930e6bd0a368..4b8ae4b4d3c9e1af83ce444eb82fe4cb28469fed 100644 --- a/lib/datasource/terraform-module/index.spec.ts +++ b/lib/datasource/terraform-module/index.spec.ts @@ -142,9 +142,9 @@ describe('datasource/terraform-module', () => { registryUrls: ['https://terraform.foo.bar'], depName: 'hashicorp/consul/aws', }); + expect(httpMock.getTrace()).toMatchSnapshot(); expect(res).toMatchSnapshot(); expect(res).not.toBeNull(); - expect(httpMock.getTrace()).toMatchSnapshot(); }); }); }); diff --git a/lib/platform/bitbucket-server/__snapshots__/index.spec.ts.snap b/lib/platform/bitbucket-server/__snapshots__/index.spec.ts.snap index a290c502687f231fdb436c8735b0e30a247ec263..f4ca77d54e791727bad6dd5e30fc7cbd108dae5d 100644 --- a/lib/platform/bitbucket-server/__snapshots__/index.spec.ts.snap +++ b/lib/platform/bitbucket-server/__snapshots__/index.spec.ts.snap @@ -60,7 +60,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 98, + "content-length": "98", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -152,7 +152,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 98, + "content-length": "98", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -246,7 +246,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 98, + "content-length": "98", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -384,7 +384,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 98, + "content-length": "98", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -452,7 +452,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 98, + "content-length": "98", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -520,7 +520,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 153, + "content-length": "153", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -588,7 +588,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 153, + "content-length": "153", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -689,7 +689,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 31, + "content-length": "31", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -757,7 +757,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 18, + "content-length": "18", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -837,7 +837,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 56, + "content-length": "56", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -905,7 +905,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 24, + "content-length": "24", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2907,7 +2907,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 91, + "content-length": "91", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2987,7 +2987,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 87, + "content-length": "87", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3067,7 +3067,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 87, + "content-length": "87", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3147,7 +3147,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 91, + "content-length": "91", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3227,7 +3227,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 91, + "content-length": "91", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3336,7 +3336,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 94, + "content-length": "94", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3406,7 +3406,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 94, + "content-length": "94", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3544,7 +3544,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 94, + "content-length": "94", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3612,7 +3612,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 94, + "content-length": "94", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3684,7 +3684,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 98, + "content-length": "98", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3776,7 +3776,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 98, + "content-length": "98", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3870,7 +3870,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 98, + "content-length": "98", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4008,7 +4008,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 98, + "content-length": "98", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4076,7 +4076,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 98, + "content-length": "98", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4144,7 +4144,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 153, + "content-length": "153", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4212,7 +4212,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 153, + "content-length": "153", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4313,7 +4313,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 31, + "content-length": "31", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4381,7 +4381,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 18, + "content-length": "18", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4461,7 +4461,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 56, + "content-length": "56", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4529,7 +4529,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 24, + "content-length": "24", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -6531,7 +6531,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 91, + "content-length": "91", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -6611,7 +6611,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 87, + "content-length": "87", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -6691,7 +6691,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 87, + "content-length": "87", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -6771,7 +6771,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 91, + "content-length": "91", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -6851,7 +6851,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 91, + "content-length": "91", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -6960,7 +6960,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 94, + "content-length": "94", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -7030,7 +7030,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 94, + "content-length": "94", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -7168,7 +7168,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 94, + "content-length": "94", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -7236,7 +7236,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 94, + "content-length": "94", "content-type": "application/json", "host": "stash.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", diff --git a/lib/platform/bitbucket/__snapshots__/comments.spec.ts.snap b/lib/platform/bitbucket/__snapshots__/comments.spec.ts.snap index e4613d34dfcdb5b3ee00a2e0b0d7bfd669d2ded9..8b6140a34051a00681b168b682cb9bf33edd7736 100644 --- a/lib/platform/bitbucket/__snapshots__/comments.spec.ts.snap +++ b/lib/platform/bitbucket/__snapshots__/comments.spec.ts.snap @@ -17,7 +17,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 42, + "content-length": "42", "content-type": "application/json", "host": "api.bitbucket.org", "user-agent": "https://github.com/renovatebot/renovate", @@ -45,7 +45,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 55, + "content-length": "55", "content-type": "application/json", "host": "api.bitbucket.org", "user-agent": "https://github.com/renovatebot/renovate", diff --git a/lib/platform/bitbucket/__snapshots__/index.spec.ts.snap b/lib/platform/bitbucket/__snapshots__/index.spec.ts.snap index c397a1e072dc631f3779f975b20bd7b67bd97af9..c82aed6d1ac2b1fb15aef202d944ea72aebc3e4c 100644 --- a/lib/platform/bitbucket/__snapshots__/index.spec.ts.snap +++ b/lib/platform/bitbucket/__snapshots__/index.spec.ts.snap @@ -42,7 +42,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 84, + "content-length": "84", "content-type": "application/json", "host": "api.bitbucket.org", "user-agent": "https://github.com/renovatebot/renovate", @@ -83,7 +83,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 183, + "content-length": "183", "content-type": "application/json", "host": "api.bitbucket.org", "user-agent": "https://github.com/renovatebot/renovate", @@ -222,7 +222,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 62, + "content-length": "62", "content-type": "application/json", "host": "api.bitbucket.org", "user-agent": "https://github.com/renovatebot/renovate", @@ -263,7 +263,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 18, + "content-length": "18", "content-type": "application/json", "host": "api.bitbucket.org", "user-agent": "https://github.com/renovatebot/renovate", @@ -304,7 +304,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 18, + "content-length": "18", "content-type": "application/json", "host": "api.bitbucket.org", "user-agent": "https://github.com/renovatebot/renovate", @@ -318,7 +318,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 46, + "content-length": "46", "content-type": "application/json", "host": "api.bitbucket.org", "user-agent": "https://github.com/renovatebot/renovate", @@ -359,7 +359,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 18, + "content-length": "18", "content-type": "application/json", "host": "api.bitbucket.org", "user-agent": "https://github.com/renovatebot/renovate", @@ -373,7 +373,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 18, + "content-length": "18", "content-type": "application/json", "host": "api.bitbucket.org", "user-agent": "https://github.com/renovatebot/renovate", @@ -1167,7 +1167,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 84, + "content-length": "84", "content-type": "application/json", "host": "api.bitbucket.org", "user-agent": "https://github.com/renovatebot/renovate", @@ -1224,7 +1224,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 97, + "content-length": "97", "content-type": "application/json", "host": "api.bitbucket.org", "user-agent": "https://github.com/renovatebot/renovate", @@ -1287,7 +1287,7 @@ Array [ "accept": "application/json", "accept-encoding": "gzip, deflate", "authorization": "Basic YWJjOjEyMw==", - "content-length": 130, + "content-length": "130", "content-type": "application/json", "host": "api.bitbucket.org", "user-agent": "https://github.com/renovatebot/renovate", diff --git a/lib/platform/gitea/__snapshots__/gitea-helper.spec.ts.snap b/lib/platform/gitea/__snapshots__/gitea-helper.spec.ts.snap index 355712ff2d91fd00e87841b03fcba4c22cca17ee..f1bed54e7a155fc3caea23f8575a39c2ca080175 100644 --- a/lib/platform/gitea/__snapshots__/gitea-helper.spec.ts.snap +++ b/lib/platform/gitea/__snapshots__/gitea-helper.spec.ts.snap @@ -7,7 +7,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 18, + "content-length": "18", "content-type": "application/json", "host": "gitea.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -25,7 +25,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 18, + "content-length": "18", "content-type": "application/json", "host": "gitea.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -43,7 +43,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 23, + "content-length": "23", "content-type": "application/json", "host": "gitea.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -61,7 +61,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 136, + "content-length": "136", "content-type": "application/json", "host": "gitea.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -79,7 +79,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 84, + "content-length": "84", "content-type": "application/json", "host": "gitea.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -97,7 +97,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 144, + "content-length": "144", "content-type": "application/json", "host": "gitea.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -550,7 +550,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 15, + "content-length": "15", "content-type": "application/json", "host": "gitea.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -688,7 +688,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 19, + "content-length": "19", "content-type": "application/json", "host": "gitea.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -706,7 +706,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 81, + "content-length": "81", "content-type": "application/json", "host": "gitea.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -724,7 +724,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 96, + "content-length": "96", "content-type": "application/json", "host": "gitea.renovatebot.com", "user-agent": "https://github.com/renovatebot/renovate", diff --git a/lib/platform/github/__snapshots__/index.spec.ts.snap b/lib/platform/github/__snapshots__/index.spec.ts.snap index a390cd93bb624bf23d91dcfa60d367426eca46c0..3a4011ff71bee04bdb6f2c0e242f985b7a0bfb30 100644 --- a/lib/platform/github/__snapshots__/index.spec.ts.snap +++ b/lib/platform/github/__snapshots__/index.spec.ts.snap @@ -26,7 +26,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -40,7 +40,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 42, + "content-length": "42", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -77,7 +77,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -91,7 +91,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 72, + "content-length": "72", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -136,7 +136,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -150,7 +150,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 112, + "content-length": "112", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -195,7 +195,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -209,7 +209,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 95, + "content-length": "95", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -223,7 +223,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 19, + "content-length": "19", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -248,7 +248,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 149, + "content-length": "149", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -315,7 +315,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -329,7 +329,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 98, + "content-length": "98", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -366,7 +366,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -414,7 +414,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -457,7 +457,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 513, + "content-length": "513", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -482,7 +482,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 44, + "content-length": "44", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -519,7 +519,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -562,7 +562,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 513, + "content-length": "513", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -587,7 +587,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 44, + "content-length": "44", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -624,7 +624,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -667,7 +667,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 513, + "content-length": "513", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -681,7 +681,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 44, + "content-length": "44", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -718,7 +718,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -761,7 +761,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 513, + "content-length": "513", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -809,7 +809,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -852,7 +852,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 513, + "content-length": "513", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -900,7 +900,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -943,7 +943,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 513, + "content-length": "513", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1002,7 +1002,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1045,7 +1045,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 513, + "content-length": "513", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1110,7 +1110,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 425, + "content-length": "425", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1164,7 +1164,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 425, + "content-length": "425", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1178,7 +1178,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 42, + "content-length": "42", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1221,7 +1221,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 425, + "content-length": "425", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1275,7 +1275,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 425, + "content-length": "425", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1300,7 +1300,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 40, + "content-length": "40", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1343,7 +1343,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 425, + "content-length": "425", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1357,7 +1357,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 18, + "content-length": "18", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1411,7 +1411,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 425, + "content-length": "425", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1454,7 +1454,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 425, + "content-length": "425", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1508,7 +1508,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 425, + "content-length": "425", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1562,7 +1562,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 425, + "content-length": "425", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1587,7 +1587,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 57, + "content-length": "57", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1630,7 +1630,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 425, + "content-length": "425", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1644,7 +1644,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 18, + "content-length": "18", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1687,7 +1687,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 425, + "content-length": "425", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1741,7 +1741,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 425, + "content-length": "425", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1826,7 +1826,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1899,7 +1899,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -1995,7 +1995,7 @@ Array [ "accept": "application/vnd.github.merge-info-preview+json, application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 1413, + "content-length": "1413", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2038,7 +2038,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 513, + "content-length": "513", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2122,7 +2122,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2169,7 +2169,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 27, + "content-length": "27", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2265,7 +2265,7 @@ Array [ "accept": "application/vnd.github.merge-info-preview+json, application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 1413, + "content-length": "1413", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2308,7 +2308,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 513, + "content-length": "513", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2367,7 +2367,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2426,7 +2426,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2463,7 +2463,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2500,7 +2500,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2559,7 +2559,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2618,7 +2618,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2677,7 +2677,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2736,7 +2736,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2795,7 +2795,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2843,7 +2843,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2914,7 +2914,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -2999,7 +2999,7 @@ Array [ "accept": "application/vnd.github.merge-info-preview+json, application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 1413, + "content-length": "1413", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3053,7 +3053,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 513, + "content-length": "513", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3107,7 +3107,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3192,7 +3192,7 @@ Array [ "accept": "application/vnd.github.merge-info-preview+json, application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 1413, + "content-length": "1413", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3253,7 +3253,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3338,7 +3338,7 @@ Array [ "accept": "application/vnd.github.merge-info-preview+json, application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 1413, + "content-length": "1413", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3381,7 +3381,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 513, + "content-length": "513", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3447,7 +3447,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3532,7 +3532,7 @@ Array [ "accept": "application/vnd.github.merge-info-preview+json, application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 1413, + "content-length": "1413", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3575,7 +3575,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 513, + "content-length": "513", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3651,7 +3651,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3736,7 +3736,7 @@ Array [ "accept": "application/vnd.github.merge-info-preview+json, application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 1413, + "content-length": "1413", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3779,7 +3779,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 513, + "content-length": "513", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3838,7 +3838,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3923,7 +3923,7 @@ Array [ "accept": "application/vnd.github.merge-info-preview+json, application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 1413, + "content-length": "1413", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -3966,7 +3966,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 513, + "content-length": "513", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4036,7 +4036,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "github.company.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4189,7 +4189,7 @@ Array [ "accept": "application/vnd.github.vixen-preview+json, application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 697, + "content-length": "697", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4251,7 +4251,7 @@ Array [ "accept": "application/vnd.github.vixen-preview+json, application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 697, + "content-length": "697", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4313,7 +4313,7 @@ Array [ "accept": "application/vnd.github.vixen-preview+json, application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 697, + "content-length": "697", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4375,7 +4375,7 @@ Array [ "accept": "application/vnd.github.vixen-preview+json, application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 697, + "content-length": "697", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4575,7 +4575,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4652,7 +4652,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4696,7 +4696,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4740,7 +4740,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4784,7 +4784,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4821,7 +4821,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4869,7 +4869,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4906,7 +4906,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4950,7 +4950,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -4997,7 +4997,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 27, + "content-length": "27", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5041,7 +5041,7 @@ Array [ "accept": "application/vnd.github.machine-man-preview+json, application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5078,7 +5078,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5115,7 +5115,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5129,7 +5129,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 25, + "content-length": "25", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5143,7 +5143,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 25, + "content-length": "25", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5157,7 +5157,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 25, + "content-length": "25", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5171,7 +5171,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 24, + "content-length": "24", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5208,7 +5208,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5222,7 +5222,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 25, + "content-length": "25", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5236,7 +5236,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 25, + "content-length": "25", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5250,7 +5250,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 25, + "content-length": "25", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5287,7 +5287,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5301,7 +5301,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 25, + "content-length": "25", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5338,7 +5338,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5352,7 +5352,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 25, + "content-length": "25", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5389,7 +5389,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5403,7 +5403,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 25, + "content-length": "25", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5440,7 +5440,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5454,7 +5454,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 25, + "content-length": "25", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5491,7 +5491,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5539,7 +5539,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5564,7 +5564,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 101, + "content-length": "101", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5623,7 +5623,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 280, + "content-length": "280", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", @@ -5637,7 +5637,7 @@ Array [ "accept": "application/vnd.github.v3+json", "accept-encoding": "gzip, deflate", "authorization": "token abc123", - "content-length": 52, + "content-length": "52", "content-type": "application/json", "host": "api.github.com", "user-agent": "https://github.com/renovatebot/renovate", diff --git a/lib/platform/gitlab/__snapshots__/index.spec.ts.snap b/lib/platform/gitlab/__snapshots__/index.spec.ts.snap index a6384ade06b5aa3cd23d591469cf51fc630d37aa..67ea7a3a9fcf4eb4c548307ae82929694fa42242 100644 --- a/lib/platform/gitlab/__snapshots__/index.spec.ts.snap +++ b/lib/platform/gitlab/__snapshots__/index.spec.ts.snap @@ -17,7 +17,6 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 0, "host": "gitlab.com", "private-token": "abc123", "user-agent": "https://github.com/renovatebot/renovate", @@ -45,7 +44,6 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 0, "host": "gitlab.com", "private-token": "abc123", "user-agent": "https://github.com/renovatebot/renovate", @@ -68,7 +66,6 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 0, "host": "gitlab.com", "private-token": "abc123", "user-agent": "https://github.com/renovatebot/renovate", @@ -112,7 +109,6 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 0, "host": "gitlab.com", "private-token": "abc123", "user-agent": "https://github.com/renovatebot/renovate", @@ -135,7 +131,6 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 0, "host": "gitlab.com", "private-token": "abc123", "user-agent": "https://github.com/renovatebot/renovate", @@ -155,7 +150,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 117, + "content-length": "117", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", @@ -191,7 +186,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 72, + "content-length": "72", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", @@ -220,7 +215,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 119, + "content-length": "119", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", @@ -249,7 +244,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 117, + "content-length": "117", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", @@ -322,7 +317,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 25, + "content-length": "25", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", @@ -363,7 +358,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 44, + "content-length": "44", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", @@ -404,7 +399,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 44, + "content-length": "44", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", @@ -564,7 +559,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 49, + "content-length": "49", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", @@ -632,7 +627,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 49, + "content-length": "49", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", @@ -662,7 +657,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 23, + "content-length": "23", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", @@ -1600,7 +1595,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 36, + "content-length": "36", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", @@ -1646,7 +1641,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 101, + "content-length": "101", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", @@ -1687,7 +1682,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 100, + "content-length": "100", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", @@ -1728,7 +1723,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 101, + "content-length": "101", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", @@ -1758,7 +1753,7 @@ Array [ "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate", - "content-length": 38, + "content-length": "38", "content-type": "application/json", "host": "gitlab.com", "private-token": "abc123", diff --git a/lib/util/http/auth.spec.ts b/lib/util/http/auth.spec.ts index a74d639f30c1239164bdb3bf071accf39aafe6ff..b164c553806556b62d489347e90b3db6a4c8288a 100644 --- a/lib/util/http/auth.spec.ts +++ b/lib/util/http/auth.spec.ts @@ -1,29 +1,53 @@ -import { getName } from '../../../test/util'; +import { NormalizedOptions } from 'got'; +import { getName, partial } from '../../../test/util'; import { PLATFORM_TYPE_GITEA } from '../../constants/platforms'; import { applyAuthorization, removeAuthorization } from './auth'; +import { GotOptions } from './types'; describe(getName(__filename), () => { describe('applyAuthorization', () => { it('does nothing', () => { - const opts = { + const opts: GotOptions = { + headers: { authorization: 'token' }, hostname: 'amazon.com', href: 'https://amazon.com', - auth: 'XXXX', }; applyAuthorization(opts); expect(opts).toMatchInlineSnapshot(` Object { - "auth": "XXXX", + "headers": Object { + "authorization": "token", + }, "hostname": "amazon.com", "href": "https://amazon.com", } `); }); + it('gitea password', () => { + const opts: GotOptions = { + headers: {}, + hostType: PLATFORM_TYPE_GITEA, + password: 'XXXX', + }; + + applyAuthorization(opts); + + expect(opts).toMatchInlineSnapshot(` + Object { + "headers": Object { + "authorization": "Basic OlhYWFg=", + }, + "hostType": "gitea", + "password": "XXXX", + } + `); + }); + it('gittea token', () => { - const opts = { + const opts: GotOptions = { headers: {}, token: 'XXXX', hostType: PLATFORM_TYPE_GITEA, @@ -45,11 +69,11 @@ describe(getName(__filename), () => { describe('removeAuthorization', () => { it('no authorization', () => { - const opts = { + const opts = partial<NormalizedOptions>({ hostname: 'amazon.com', href: 'https://amazon.com', search: 'something X-Amz-Algorithm something', - }; + }); removeAuthorization(opts); @@ -61,15 +85,15 @@ describe(getName(__filename), () => { }); it('Amazon', () => { - const opts = { - auth: 'auth', + const opts = partial<NormalizedOptions>({ + password: 'auth', headers: { authorization: 'auth', }, hostname: 'amazon.com', href: 'https://amazon.com', search: 'something X-Amz-Algorithm something', - }; + }); removeAuthorization(opts); @@ -82,8 +106,8 @@ describe(getName(__filename), () => { }); it('Amazon ports', () => { - const opts = { - auth: 'auth', + const opts = partial<NormalizedOptions>({ + password: 'auth', headers: { authorization: 'auth', }, @@ -91,7 +115,7 @@ describe(getName(__filename), () => { href: 'https://amazon.com', port: 3000, search: 'something X-Amz-Algorithm something', - }; + }); removeAuthorization(opts); @@ -104,15 +128,15 @@ describe(getName(__filename), () => { }); it('Azure blob', () => { - const opts = { - auth: 'auth', + const opts = partial<NormalizedOptions>({ + password: 'auth', headers: { authorization: 'auth', }, hostname: 'store123.blob.core.windows.net', href: 'https://<store>.blob.core.windows.net/<some id>//docker/registry/v2/blobs', - }; + }); removeAuthorization(opts); @@ -125,20 +149,20 @@ describe(getName(__filename), () => { }); it('keep auth', () => { - const opts = { - auth: 'auth', + const opts = partial<NormalizedOptions>({ + password: 'auth', headers: { authorization: 'auth', }, hostname: 'renovate.com', href: 'https://renovate.com', search: 'something', - }; + }); removeAuthorization(opts); expect(opts).toEqual({ - auth: 'auth', + password: 'auth', headers: { authorization: 'auth', }, diff --git a/lib/util/http/auth.ts b/lib/util/http/auth.ts index 80f22a45aaba58d5ee75a7df67b433e6743e7545..9b7fa0394be68f4dfe707e96f5b2089d0a296be5 100644 --- a/lib/util/http/auth.ts +++ b/lib/util/http/auth.ts @@ -1,12 +1,14 @@ +import { NormalizedOptions } from 'got'; import { PLATFORM_TYPE_GITEA, PLATFORM_TYPE_GITHUB, PLATFORM_TYPE_GITLAB, } from '../../constants/platforms'; +import { GotOptions } from './types'; -export function applyAuthorization(inOptions: any): any { +export function applyAuthorization(inOptions: GotOptions): GotOptions { const options = { ...inOptions }; - if (options.auth || options.headers?.authorization) { + if (options.headers?.authorization) { return options; } if (options.token) { @@ -21,17 +23,25 @@ export function applyAuthorization(inOptions: any): any { options.headers.authorization = `Bearer ${options.token}`; } delete options.token; + } else if (options.password) { + // Otherwise got will add username and password to url and header + const auth = Buffer.from( + `${options.username || ''}:${options.password}` + ).toString('base64'); + options.headers.authorization = `Basic ${auth}`; + delete options.username; + delete options.password; } return options; } // isAmazon return true if request options contains Amazon related headers -function isAmazon(options: any): boolean { +function isAmazon(options: NormalizedOptions): boolean { return options.search?.includes('X-Amz-Algorithm'); } // isAzureBlob return true if request options contains Azure container registry related data -function isAzureBlob(options: any): boolean { +function isAzureBlob(options: NormalizedOptions): boolean { return ( options.hostname?.endsWith('.blob.core.windows.net') && // lgtm [js/incomplete-url-substring-sanitization] options.href?.includes('/docker/registry') @@ -39,8 +49,8 @@ function isAzureBlob(options: any): boolean { } // removeAuthorization from the redirect options -export function removeAuthorization(options: any): void { - if (!options.auth && !options.headers?.authorization) { +export function removeAuthorization(options: NormalizedOptions): void { + if (!options.password && !options.headers?.authorization) { return; } @@ -58,6 +68,7 @@ export function removeAuthorization(options: any): void { // registry is hosted on Amazon or Azure blob, redirect url includes // authentication which is not required and should be removed delete options.headers.authorization; // eslint-disable-line no-param-reassign - delete options.auth; // eslint-disable-line no-param-reassign + delete options.username; // eslint-disable-line no-param-reassign + delete options.password; // eslint-disable-line no-param-reassign } } diff --git a/lib/util/http/github.ts b/lib/util/http/github.ts index c133e138b5f9b5f62613e9f556a89d9bd499d02d..39c5a59aeb00d390e0f815dbe4427270a3e1e02d 100644 --- a/lib/util/http/github.ts +++ b/lib/util/http/github.ts @@ -11,7 +11,7 @@ import { PLATFORM_TYPE_GITHUB } from '../../constants/platforms'; import { logger } from '../../logger'; import { ExternalHostError } from '../../types/errors/external-host-error'; import { maskToken } from '../mask'; -import { HttpError } from './types'; +import { GotLegacyError } from './legacy'; import { Http, HttpPostOptions, HttpResponse, InternalHttpOptions } from '.'; let baseUrl = 'https://api.github.com/'; @@ -19,14 +19,6 @@ export const setBaseUrl = (url: string): void => { baseUrl = url; }; -type GotRequestError<E = unknown, T = unknown> = HttpError & { - body: { - message?: string; - errors?: E[]; - }; - headers?: Record<string, T>; -}; - interface GithubInternalOptions extends InternalHttpOptions { body?: string; } @@ -45,7 +37,7 @@ interface GithubGraphqlResponse<T = unknown> { } function handleGotError( - err: GotRequestError, + err: GotLegacyError, url: string | URL, opts: GithubHttpOptions ): never { @@ -115,18 +107,14 @@ function handleGotError( message.includes('Review cannot be requested from pull request author') ) { throw err; - } else if ( - err.body && - err.body.errors && - err.body.errors.find((e: any) => e.code === 'invalid') - ) { + } else if (err.body?.errors?.find((e: any) => e.code === 'invalid')) { throw new Error(REPOSITORY_CHANGED); } logger.debug({ err }, '422 Error thrown from GitHub'); throw new ExternalHostError(err, PLATFORM_TYPE_GITHUB); } if (err.statusCode === 404) { - logger.debug({ url: err.url }, 'GitHub 404'); + logger.debug({ url: err.options?.url }, 'GitHub 404'); } else { logger.debug({ err }, 'Unknown GitHub error'); } diff --git a/lib/util/http/host-rules.spec.ts b/lib/util/http/host-rules.spec.ts index a3c30315faa3b0f1596cc28359df42d53074b414..1651de3b91f4d4f4cc6b016e44140f4ee87959cc 100644 --- a/lib/util/http/host-rules.spec.ts +++ b/lib/util/http/host-rules.spec.ts @@ -45,8 +45,9 @@ describe(getName(__filename), () => { expect(applyHostRules(url, { hostType: PLATFORM_TYPE_GITEA })) .toMatchInlineSnapshot(` Object { - "auth": ":password", "hostType": "gitea", + "password": "password", + "username": undefined, } `); }); diff --git a/lib/util/http/host-rules.ts b/lib/util/http/host-rules.ts index c3a5e0993f4aba17e6a7cb1ca9c4e4eaae4e0640..85ab0a2da23cf152e88d78f8c788d6d8bb566e46 100644 --- a/lib/util/http/host-rules.ts +++ b/lib/util/http/host-rules.ts @@ -1,9 +1,10 @@ import { logger } from '../../logger'; import * as hostRules from '../host-rules'; +import { GotOptions } from './types'; // Apply host rules to requests -export function applyHostRules(url: string, inOptions: any): any { +export function applyHostRules(url: string, inOptions: GotOptions): GotOptions { const options = { ...inOptions }; const foundRules = hostRules.find({ @@ -11,11 +12,12 @@ export function applyHostRules(url: string, inOptions: any): any { url, }) || /* istanbul ignore next: can only happen in tests */ {}; const { username, password, token, enabled } = foundRules; - if (options.headers?.authorization || options.auth || options.token) { + if (options.headers?.authorization || options.password || options.token) { logger.trace('Authorization already set for host: ' + options.hostname); } else if (password) { logger.trace('Applying Basic authentication for host ' + options.hostname); - options.auth = `${username || ''}:${password}`; + options.username = username; + options.password = password; } else if (token) { logger.trace('Applying Bearer authentication for host ' + options.hostname); options.token = token; diff --git a/lib/util/http/index.ts b/lib/util/http/index.ts index 87e7239da2f89b874ada933c04d9aec85ba22c74..3f3fa1c735a82b8dd5b1c27dce710d92ddf1b26a 100644 --- a/lib/util/http/index.ts +++ b/lib/util/http/index.ts @@ -1,12 +1,16 @@ import crypto from 'crypto'; import URL from 'url'; -import got from 'got'; +import got, { Options } from 'got'; import { HOST_DISABLED } from '../../constants/error-messages'; import { ExternalHostError } from '../../types/errors/external-host-error'; import * as memCache from '../cache/memory'; import { clone } from '../clone'; import { applyAuthorization, removeAuthorization } from './auth'; import { applyHostRules } from './host-rules'; +import { GotOptions } from './types'; + +// TODO: refactor code to remove this +import './legacy'; export * from './types'; @@ -16,7 +20,8 @@ interface OutgoingHttpHeaders { export interface HttpOptions { body?: any; - auth?: string; + username?: string; + password?: string; baseUrl?: string; headers?: OutgoingHttpHeaders; throwHttpErrors?: boolean; @@ -28,7 +33,8 @@ export interface HttpPostOptions extends HttpOptions { } export interface InternalHttpOptions extends HttpOptions { - json?: boolean; + json?: object; + responseType?: 'json'; method?: 'get' | 'post' | 'put' | 'patch' | 'delete' | 'head'; } @@ -47,7 +53,7 @@ function cloneResponse<T>(response: any): HttpResponse<T> { async function resolveResponse<T>( promisedRes: Promise<HttpResponse<T>>, - { abortOnError, abortIgnoreStatusCodes } + { abortOnError, abortIgnoreStatusCodes }: GotOptions ): Promise<HttpResponse<T>> { try { const res = await promisedRes; @@ -60,9 +66,11 @@ async function resolveResponse<T>( } } -function applyDefaultHeaders(options: any): void { +function applyDefaultHeaders(options: Options): void { // eslint-disable-next-line no-param-reassign options.headers = { + // TODO: remove. Will be "gzip, deflate, br" by new got default + 'accept-encoding': 'gzip, deflate', ...options.headers, 'user-agent': process.env.RENOVATE_USER_AGENT || @@ -82,12 +90,12 @@ export class Http<GetOptions = HttpOptions, PostOptions = HttpPostOptions> { url = URL.resolve(httpOptions.baseUrl, url); } // TODO: deep merge in order to merge headers - let options: any = { + let options: GotOptions = { method: 'get', ...this.options, hostType: this.hostType, ...httpOptions, - }; + } as unknown; // TODO: fixme if (process.env.NODE_ENV === 'test') { options.retry = 0; } @@ -117,7 +125,7 @@ export class Http<GetOptions = HttpOptions, PostOptions = HttpPostOptions> { } } const startTime = Date.now(); - const promisedRes = got(url, options); + const promisedRes = got<T>(url, options); if (options.method === 'get') { memCache.set(cacheKey, promisedRes); // always set if it's a get } @@ -144,9 +152,15 @@ export class Http<GetOptions = HttpOptions, PostOptions = HttpPostOptions> { url: string, options: InternalHttpOptions ): Promise<HttpResponse<T>> { - const res = await this.request<T>(url, { ...options, json: true }); - const body = res.body; - return { ...res, body }; + const { body, ...jsonOptions } = options; + if (body) { + jsonOptions.json = body; + } + const res = await this.request<T>(url, { + ...jsonOptions, + responseType: 'json', + }); + return { ...res, body: res.body }; } getJson<T = unknown>( @@ -199,6 +213,12 @@ export class Http<GetOptions = HttpOptions, PostOptions = HttpPostOptions> { ...options, }; + // istanbul ignore else: needs test + if (options?.baseUrl) { + // eslint-disable-next-line no-param-reassign + url = URL.resolve(options.baseUrl, url); + } + applyDefaultHeaders(combinedOptions); return got.stream(url, combinedOptions); } diff --git a/lib/util/http/legacy.ts b/lib/util/http/legacy.ts new file mode 100644 index 0000000000000000000000000000000000000000..fa4de817740d231f8921d950909f1101a7e1b97c --- /dev/null +++ b/lib/util/http/legacy.ts @@ -0,0 +1,36 @@ +// istanbul ignore file +import { HttpError } from './types'; + +// TODO: remove when code is refactord + +Object.defineProperty(HttpError.prototype, 'statusCode', { + get: function statusCode(this: HttpError) { + return this.response?.statusCode; + }, +}); + +Object.defineProperty(HttpError.prototype, 'body', { + get: function body(this: HttpError): unknown { + return this.response?.body; + }, + set: function body(this: HttpError, value: unknown): void { + if (this.response) { + this.response.body = value; + } + }, +}); + +Object.defineProperty(HttpError.prototype, 'headers', { + get: function headers(this: HttpError) { + return this.response?.headers; + }, +}); + +export type GotLegacyError<E = unknown, T = unknown> = HttpError & { + statusCode?: number; + body: { + message?: string; + errors?: E[]; + }; + headers?: Record<string, T>; +}; diff --git a/lib/util/http/types.ts b/lib/util/http/types.ts index f82973c79aa5c67c1b2c19e9a875218c043794e6..5b29393c424975f4134885ee2f3d53022901e33a 100644 --- a/lib/util/http/types.ts +++ b/lib/util/http/types.ts @@ -1,5 +1,13 @@ -import { GotError } from 'got'; +import { OptionsOfJSONResponseBody, RequestError as RequestError_ } from 'got'; -export type HttpError = GotError & { - statusCode?: number; +// TODO: Move options to context +export type GotOptions = OptionsOfJSONResponseBody & { + abortOnError?: boolean; + abortIgnoreStatusCodes?: number[]; + token?: string; + hostType?: string; + enabled?: boolean; + useCache?: boolean; }; + +export { RequestError_ as HttpError }; diff --git a/package.json b/package.json index 5e8808f4214c24a62cc7a3deb1cd16fb14b4fba7..2cc99579c161f779f9f3a283b106bb9d94cb05e5 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "fs-extra": "9.0.1", "github-url-from-git": "1.5.0", "global-agent": "2.1.12", - "got": "9.6.0", + "got": "11.5.0", "handlebars": "4.7.6", "handy-redis": "1.8.3", "hasha": "5.2.0", @@ -197,7 +197,6 @@ "@types/fs-extra": "9.0.1", "@types/github-url-from-git": "1.5.0", "@types/global-agent": "2.1.0", - "@types/got": "9.6.11", "@types/ini": "1.3.30", "@types/jest": "26.0.5", "@types/js-yaml": "3.12.4", diff --git a/yarn.lock b/yarn.lock index 2162c8284a0023635f5b7490f3f5534129a704d9..11a7583368a9994b9331994ed6ebae8caf9d9817 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1387,10 +1387,10 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.0.0.tgz#78fabc5e295adb6e1ef57eaafe4cc5d7aa35b183" integrity sha512-kqA5I6Yun7PBHk8WN9BBP1c7FfN2SrD05GuVSEYPqDb4nerv7HqYfgBfMIKmT/EuejURkJKLZuLyGKGs6WEG9w== -"@sindresorhus/is@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" - integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== +"@sindresorhus/is@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.0.0.tgz#78fabc5e295adb6e1ef57eaafe4cc5d7aa35b183" + integrity sha512-kqA5I6Yun7PBHk8WN9BBP1c7FfN2SrD05GuVSEYPqDb4nerv7HqYfgBfMIKmT/EuejURkJKLZuLyGKGs6WEG9w== "@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.7.2": version "1.8.0" @@ -1428,12 +1428,12 @@ resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5" integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ== -"@szmarczak/http-timer@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" - integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== +"@szmarczak/http-timer@^4.0.5": + version "4.0.5" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.5.tgz#bfbd50211e9dfa51ba07da58a14cdfd333205152" + integrity sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ== dependencies: - defer-to-connect "^1.0.1" + defer-to-connect "^2.0.0" "@tootallnate/once@1": version "1.1.2" @@ -1487,6 +1487,16 @@ dependencies: "@types/node" "*" +"@types/cacheable-request@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.1.tgz#5d22f3dded1fd3a84c0bbeb5039a7419c2c91976" + integrity sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ== + dependencies: + "@types/http-cache-semantics" "*" + "@types/keyv" "*" + "@types/node" "*" + "@types/responselike" "*" + "@types/changelog-filename-regex@2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@types/changelog-filename-regex/-/changelog-filename-regex-2.0.0.tgz#b5af0ee9b36106f593dfd6ac6b6514ec166c4ef2" @@ -1550,15 +1560,6 @@ resolved "https://registry.yarnpkg.com/@types/global-agent/-/global-agent-2.1.0.tgz#1becbcb067c9c7a8d2cd70b786ca1d062538e299" integrity sha512-xBOerse4Agekl7VZJclA9bfuA9aa3u9T24TDkBiMQrZgu4qe5HMBPzVGzAt2k4dx/v3uIFI6CzG0Z9X894LHrg== -"@types/got@9.6.11": - version "9.6.11" - resolved "https://registry.yarnpkg.com/@types/got/-/got-9.6.11.tgz#482b402cc5ee459481aeeadb08142ebb1a9afb26" - integrity sha512-dr3IiDNg5TDesGyuwTrN77E1Cd7DCdmCFtEfSGqr83jMMtcwhf/SGPbN2goY4JUWQfvxwY56+e5tjfi+oXeSdA== - dependencies: - "@types/node" "*" - "@types/tough-cookie" "*" - form-data "^2.5.0" - "@types/graceful-fs@^4.1.2": version "4.1.3" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f" @@ -1566,6 +1567,11 @@ dependencies: "@types/node" "*" +"@types/http-cache-semantics@*": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz#9140779736aa2655635ee756e2467d787cfe8a2a" + integrity sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A== + "@types/ini@1.3.30": version "1.3.30" resolved "https://registry.yarnpkg.com/@types/ini/-/ini-1.3.30.tgz#d1485459c9fad84e937414b832a2adb649eab379" @@ -1624,6 +1630,13 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= +"@types/keyv@*": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.1.tgz#e45a45324fca9dab716ab1230ee249c9fb52cfa7" + integrity sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw== + dependencies: + "@types/node" "*" + "@types/later@1.2.6": version "1.2.6" resolved "https://registry.yarnpkg.com/@types/later/-/later-1.2.6.tgz#8ea70d292e5fb880039a7ed13da19a24c9e35a56" @@ -1733,6 +1746,13 @@ resolved "https://registry.yarnpkg.com/@types/registry-auth-token/-/registry-auth-token-3.3.0.tgz#bfb57ed386d84749c982ec20c804ac119382b285" integrity sha512-HEnnGNRFbVXwqLV1xzQTY4zElLEn85mHAXm9LbAut0+gQI6LafAhW0qmCLuBcm5QtekXQWXFGchi0ZjTdX6Upw== +"@types/responselike@*", "@types/responselike@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" + integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== + dependencies: + "@types/node" "*" + "@types/retry@^0.12.0": version "0.12.0" resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" @@ -1768,11 +1788,6 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== -"@types/tough-cookie@*": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.0.tgz#fef1904e4668b6e5ecee60c52cc6a078ffa6697d" - integrity sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A== - "@types/traverse@0.6.32": version "0.6.32" resolved "https://registry.yarnpkg.com/@types/traverse/-/traverse-0.6.32.tgz#f9fdfa40cd4898deaa975a14511aec731de8235e" @@ -2519,18 +2534,23 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" -cacheable-request@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" - integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== +cacheable-lookup@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.3.tgz#049fdc59dffdd4fc285e8f4f82936591bd59fec3" + integrity sha512-W+JBqF9SWe18A72XFzN/V/CULFzPm7sBXzzR6ekkE+3tLG72wFZrBiBZhrZuDoYexop4PHJVdFAKb/Nj9+tm9w== + +cacheable-request@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.1.tgz#062031c2856232782ed694a257fa35da93942a58" + integrity sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw== dependencies: clone-response "^1.0.2" get-stream "^5.1.0" http-cache-semantics "^4.0.0" - keyv "^3.0.0" + keyv "^4.0.0" lowercase-keys "^2.0.0" normalize-url "^4.1.0" - responselike "^1.0.2" + responselike "^2.0.0" call-limit@^1.1.1: version "1.1.1" @@ -3278,12 +3298,12 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== dependencies: - mimic-response "^1.0.0" + mimic-response "^3.1.0" dedent@^0.7.0: version "0.7.0" @@ -3312,10 +3332,10 @@ defaults@^1.0.3: dependencies: clone "^1.0.2" -defer-to-connect@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" - integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== +defer-to-connect@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.0.tgz#83d6b199db041593ac84d781b5222308ccf4c2c1" + integrity sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg== define-properties@^1.1.2, define-properties@^1.1.3: version "1.1.3" @@ -4189,15 +4209,6 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= -form-data@^2.5.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4" - integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -4515,22 +4526,22 @@ globby@^11.0.0: merge2 "^1.3.0" slash "^3.0.0" -got@9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== - dependencies: - "@sindresorhus/is" "^0.14.0" - "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" +got@11.5.0: + version "11.5.0" + resolved "https://registry.yarnpkg.com/got/-/got-11.5.0.tgz#55dd61050f666679f46c49c877e1b2e064a7a523" + integrity sha512-vOZEcEaK0b6x11uniY0HcblZObKPRO75Jvz53VKuqGSaKCM/zEt0sj2LGYVdqDYJzO3wYdG+FPQQ1hsgoXy7vQ== + dependencies: + "@sindresorhus/is" "^3.0.0" + "@szmarczak/http-timer" "^4.0.5" + "@types/cacheable-request" "^6.0.1" + "@types/responselike" "^1.0.0" + cacheable-lookup "^5.0.3" + cacheable-request "^7.0.1" + decompress-response "^6.0.0" + http2-wrapper "^1.0.0-beta.4.8" + lowercase-keys "^2.0.0" + p-cancelable "^2.0.0" + responselike "^2.0.0" got@^6.7.1: version "6.7.1" @@ -4745,6 +4756,14 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" +http2-wrapper@^1.0.0-beta.4.8: + version "1.0.0-beta.5.0" + resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.0-beta.5.0.tgz#ae76ef7c1310a2d13d6d77f19b39c4ff951468be" + integrity sha512-yUzY7UQjB2uNg+xqOQLxdJ3QvaGpOrchBCmbyZ2zeC8I+CXrZtXfGp8VvyGz9W9Q4XVdq6+JYpclRiqWttZR+w== + dependencies: + quick-lru "^5.1.1" + resolve-alpn "^1.0.0" + https-proxy-agent@^2.2.3: version "2.2.4" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" @@ -5929,10 +5948,10 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= -json-buffer@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= +json-buffer@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" + integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== json-dup-key-validator@1.0.2: version "1.0.2" @@ -6014,12 +6033,12 @@ just-extend@^4.0.2: resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.0.tgz#7278a4027d889601640ee0ce0e5a00b992467da4" integrity sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA== -keyv@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" - integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== +keyv@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.0.1.tgz#9fe703cb4a94d6d11729d320af033307efd02ee6" + integrity sha512-xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw== dependencies: - json-buffer "3.0.0" + json-buffer "3.0.1" kind-of@>=6.0.3, kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^4.0.0, kind-of@^5.0.0, kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: version "6.0.3" @@ -6434,7 +6453,7 @@ loud-rejection@^1.0.0: currently-unhandled "^0.4.1" signal-exit "^3.0.0" -lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: +lowercase-keys@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== @@ -6764,11 +6783,16 @@ mimic-fn@^2.0.0, mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mimic-response@^1.0.0, mimic-response@^1.0.1: +mimic-response@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== + min-indent@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" @@ -7628,10 +7652,10 @@ p-all@3.0.0: dependencies: p-map "^4.0.0" -p-cancelable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" - integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== +p-cancelable@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.0.0.tgz#4a3740f5bdaf5ed5d7c3e34882c6fb5d6b266a6e" + integrity sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg== p-defer@^1.0.0: version "1.0.0" @@ -8020,11 +8044,6 @@ prepend-http@^1.0.1: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= -prepend-http@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= - prettier@2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4" @@ -8229,6 +8248,11 @@ quick-lru@^4.0.1: resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== +quick-lru@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== + qw@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/qw/-/qw-1.0.1.tgz#efbfdc740f9ad054304426acb183412cc8b996d4" @@ -8702,6 +8726,11 @@ require-main-filename@^2.0.0: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== +resolve-alpn@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.0.0.tgz#745ad60b3d6aff4b4a48e01b8c0bdc70959e0e8c" + integrity sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA== + resolve-cwd@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" @@ -8731,12 +8760,12 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3. dependencies: path-parse "^1.0.6" -responselike@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= +responselike@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.0.tgz#26391bcc3174f750f9a79eacc40a12a5c42d7723" + integrity sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw== dependencies: - lowercase-keys "^1.0.0" + lowercase-keys "^2.0.0" restore-cursor@^3.1.0: version "3.1.0" @@ -9771,11 +9800,6 @@ to-object-path@^0.3.0: dependencies: kind-of "^3.0.2" -to-readable-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" - integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== - to-regex-range@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" @@ -10203,13 +10227,6 @@ url-parse-lax@^1.0.0: dependencies: prepend-http "^1.0.1" -url-parse-lax@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= - dependencies: - prepend-http "^2.0.0" - url@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64"