refactor(http): Import proper OutgoingHttpHeaders on all http clients

lib/datasource/docker/index.ts

@@ -1,4 +1,3 @@
-import { OutgoingHttpHeaders } from 'http';
 import URL from 'url';
 import { ECR } from '@aws-sdk/client-ecr';
 import hasha from 'hasha';
@@ -11,6 +10,7 @@ import { ExternalHostError } from '../../types/errors/external-host-error';
 import * as packageCache from '../../util/cache/package';
 import * as hostRules from '../../util/host-rules';
 import { Http, HttpResponse } from '../../util/http';
+import type { OutgoingHttpHeaders } from '../../util/http/types';
 import { ensureTrailingSlash, trimTrailingSlash } from '../../util/url';
 import * as dockerVersioning from '../../versioning/docker';
 import type { GetReleasesConfig, ReleaseResult } from '../types';

lib/datasource/gradle-version/index.ts

@@ -1,5 +1,6 @@
 import { ExternalHostError } from '../../types/errors/external-host-error';
-import { Http, HttpError } from '../../util/http';
+import { Http } from '../../util/http';
+import { HttpError } from '../../util/http/types';
 import { regEx } from '../../util/regex';
 import * as gradleVersioning from '../../versioning/gradle';
 import type { GetReleasesConfig, Release, ReleaseResult } from '../types';

lib/datasource/npm/npmrc.ts

@@ -1,11 +1,11 @@
-import { OutgoingHttpHeaders } from 'http';
 import url from 'url';
 import is from '@sindresorhus/is';
 import ini from 'ini';
 import registryAuthToken from 'registry-auth-token';
 import getRegistryUrl from 'registry-auth-token/registry-url';
 import { getAdminConfig } from '../../config/admin';
 import { logger } from '../../logger';
+import type { OutgoingHttpHeaders } from '../../util/http/types';
 import { maskToken } from '../../util/mask';
 import { add } from '../../util/sanitize';
 

lib/datasource/pod/index.ts

@@ -3,8 +3,9 @@ import { HOST_DISABLED } from '../../constants/error-messages';
 import { logger } from '../../logger';
 import { ExternalHostError } from '../../types/errors/external-host-error';
 import * as packageCache from '../../util/cache/package';
-import { Http, HttpError } from '../../util/http';
+import { Http } from '../../util/http';
 import { GithubHttp } from '../../util/http/github';
+import type { HttpError } from '../../util/http/types';
 import type { GetReleasesConfig, ReleaseResult } from '../types';
 
 export const id = 'pod';

lib/datasource/rubygems/get.ts

@@ -1,7 +1,7 @@
-import { OutgoingHttpHeaders } from 'http';
 import urlJoin from 'url-join';
 import { logger } from '../../logger';
 import { Http } from '../../util/http';
+import type { OutgoingHttpHeaders } from '../../util/http/types';
 import type { ReleaseResult } from '../types';
 import { id } from './common';
 

lib/util/http/index.ts

@@ -1,4 +1,5 @@
 import crypto from 'crypto';
+import merge from 'deepmerge';
 import got, { Options, Response } from 'got';
 import { HOST_DISABLED } from '../../constants/error-messages';
 import { logger } from '../../logger';
@@ -9,17 +10,11 @@ import { resolveBaseUrl } from '../url';
 import { applyAuthorization, removeAuthorization } from './auth';
 import { applyHostRules } from './host-rules';
 import { getQueue } from './queue';
-import { GotOptions, RequestStats } from './types';
+import type { GotOptions, OutgoingHttpHeaders, RequestStats } from './types';
 
 // TODO: refactor code to remove this
 import './legacy';
 
-export * from './types';
-
-interface OutgoingHttpHeaders {
-  [header: string]: number | string | string[] | undefined;
-}
-
 export interface HttpOptions {
   body?: any;
   username?: string;
@@ -95,13 +90,16 @@ export class Http<GetOptions = HttpOptions, PostOptions = HttpPostOptions> {
     if (httpOptions?.baseUrl) {
       url = resolveBaseUrl(httpOptions.baseUrl, url);
     }
-    // TODO: deep merge in order to merge headers
-    let options: GotOptions = {
-      method: 'get',
-      ...this.options,
-      hostType: this.hostType,
-      ...httpOptions,
-    } as unknown; // TODO: fixme
+
+    let options: GotOptions = merge<GotOptions>(
+      {
+        method: 'get',
+        ...this.options,
+        hostType: this.hostType,
+      },
+      httpOptions
+    );
+
     if (process.env.NODE_ENV === 'test') {
       options.retry = 0;
     }

lib/util/http/types.ts

@@ -23,3 +23,5 @@ export interface RequestStats {
   duration: number;
   queueDuration: number;
 }
+
+export type OutgoingHttpHeaders = Record<string, string | string[] | undefined>;

lib/workers/repository/stats.ts

@@ -1,7 +1,7 @@
 import URL from 'url';
 import { logger } from '../../logger';
 import * as memCache from '../../util/cache/memory';
-import { RequestStats } from '../../util/http';
+import type { RequestStats } from '../../util/http/types';
 
 export function printRequestStats(): void {
   const httpRequests = memCache.get<RequestStats[]>('http-requests');