refactor(http): Fix coverage

lib/util/http/auth.ts

@@ -6,7 +6,20 @@ import {
 } from '../../constants';
 import type { GotOptions } from './types';
 
-export function applyAuthorization(inOptions: GotOptions): GotOptions {
+type AuthGotOptions = Pick<
+  GotOptions,
+  | 'hostType'
+  | 'headers'
+  | 'noAuth'
+  | 'context'
+  | 'token'
+  | 'username'
+  | 'password'
+>;
+
+export function applyAuthorization<GotOptions extends AuthGotOptions>(
+  inOptions: GotOptions
+): GotOptions {
   const options: GotOptions = { ...inOptions };
 
   if (options.headers?.authorization || options.noAuth) {

lib/util/http/bitbucket.ts

@@ -64,8 +64,12 @@ export class BitbucketHttp extends Http<BitbucketHttpOptions> {
 
       // Override other page-related attributes
       resultBody.pagelen = resultBody.values.length;
-      resultBody.size = page > MAX_PAGES ? undefined : resultBody.values.length;
-      resultBody.next = page > MAX_PAGES ? undefined : nextURL;
+      resultBody.size =
+        page <= MAX_PAGES
+          ? resultBody.values.length
+          : /* istanbul ignore next */ undefined;
+      resultBody.next =
+        page <= MAX_PAGES ? nextURL : /* istanbul ignore next */ undefined;
     }
 
     return result;

lib/util/http/hooks.ts

@@ -5,7 +5,9 @@ import type { Hooks, Response } from 'got';
 
 function isResponseOk(response: Response): boolean {
   const { statusCode } = response;
-  const limitStatusCode = response.request.options.followRedirect ? 299 : 399;
+  const limitStatusCode = response.request.options.followRedirect
+    ? 299
+    : /* istanbul ignore next */ 399;
 
   return (
     (statusCode >= 200 && statusCode <= limitStatusCode) || statusCode === 304

lib/util/http/host-rules.spec.ts

@@ -2,13 +2,14 @@ import { bootstrap } from '../../proxy';
 import * as hostRules from '../host-rules';
 import { dnsLookup } from './dns';
 import { applyHostRules } from './host-rules';
+import type { GotOptions } from './types';
 
 const url = 'https://github.com';
 
 jest.mock('global-agent');
 
 describe('util/http/host-rules', () => {
-  const options = {
+  const options: GotOptions = {
     hostType: 'github',
   };
 

lib/util/http/host-rules.ts

@@ -12,7 +12,29 @@ import { dnsLookup } from './dns';
 import { keepaliveAgents } from './keepalive';
 import type { GotOptions } from './types';
 
-export function findMatchingRules(options: GotOptions, url: string): HostRule {
+type HostRulesGotOptions = Pick<
+  GotOptions,
+  | 'hostType'
+  | 'url'
+  | 'noAuth'
+  | 'headers'
+  | 'token'
+  | 'username'
+  | 'password'
+  | 'context'
+  | 'enabled'
+  | 'abortOnError'
+  | 'abortIgnoreStatusCodes'
+  | 'timeout'
+  | 'lookup'
+  | 'agent'
+  | 'http2'
+>;
+
+export function findMatchingRules<GotOptions extends HostRulesGotOptions>(
+  options: GotOptions,
+  url: string
+): HostRule {
   const { hostType } = options;
   let res = hostRules.find({ hostType, url });
 
@@ -70,7 +92,10 @@ export function findMatchingRules(options: GotOptions, url: string): HostRule {
 }
 
 // Apply host rules to requests
-export function applyHostRules(url: string, inOptions: GotOptions): GotOptions {
+export function applyHostRules<GotOptions extends HostRulesGotOptions>(
+  url: string,
+  inOptions: GotOptions
+): GotOptions {
   const options: GotOptions = { ...inOptions };
   const foundRules = findMatchingRules(options, url);
   const { username, password, token, enabled, authType } = foundRules;

lib/util/http/index.ts

@@ -1,6 +1,7 @@
 import merge from 'deepmerge';
 import got, { Options, RequestError } from 'got';
 import hasha from 'hasha';
+import type { SetRequired } from 'type-fest';
 import { infer as Infer, ZodType } from 'zod';
 import { HOST_DISABLED } from '../../constants/error-messages';
 import { pkg } from '../../expose.cjs';
@@ -77,7 +78,7 @@ function applyDefaultHeaders(options: Options): void {
 // `request`.
 async function gotTask<T>(
   url: string,
-  options: GotOptions,
+  options: SetRequired<GotOptions, 'method'>,
   requestStats: Omit<RequestStats, 'duration' | 'statusCode'>
 ): Promise<HttpResponse<T>> {
   logger.trace({ url, options }, 'got request');
@@ -102,9 +103,10 @@ async function gotTask<T>(
       duration =
         error.timings?.phases.total ??
         /* istanbul ignore next: can't be tested */ -1;
-      const method = options.method?.toUpperCase() ?? 'GET';
-      const code = error.code ?? 'UNKNOWN';
-      const retryCount = error.request?.retryCount ?? -1;
+      const method = options.method?.toUpperCase();
+      const code = error.code ?? /* istanbul ignore next */ 'UNKNOWN';
+      const retryCount =
+        error.request?.retryCount ?? /* istanbul ignore next */ -1;
       logger.debug(
         `${method} ${url} = (code=${code}, statusCode=${statusCode} retryCount=${retryCount}, duration=${duration})`
       );
@@ -131,14 +133,14 @@ export class Http<Opts extends HttpOptions = HttpOptions> {
 
   protected async request<T>(
     requestUrl: string | URL,
-    httpOptions: InternalHttpOptions & HttpRequestOptions<T> = {}
+    httpOptions: InternalHttpOptions & HttpRequestOptions<T>
   ): Promise<HttpResponse<T>> {
     let url = requestUrl.toString();
     if (httpOptions?.baseUrl) {
       url = resolveBaseUrl(httpOptions.baseUrl, url);
     }
 
-    let options: GotOptions = merge<GotOptions>(
+    let options = merge<SetRequired<GotOptions, 'method'>, GotOptions>(
       {
         method: 'get',
         ...this.options,
@@ -148,8 +150,7 @@ export class Http<Opts extends HttpOptions = HttpOptions> {
     );
 
     const etagCache =
-      httpOptions.etagCache &&
-      (options.method === 'get' || options.method === 'head')
+      httpOptions.etagCache && options.method === 'get'
         ? httpOptions.etagCache
         : null;
     if (etagCache) {
@@ -202,7 +203,7 @@ export class Http<Opts extends HttpOptions = HttpOptions> {
       const httpTask: Task<T> = () => {
         const queueDuration = Date.now() - startTime;
         return gotTask(url, options, {
-          method: options.method ?? 'get',
+          method: options.method,
           url,
           queueDuration,
         });