Merge pull request #2333 from cjihrig/native-fetch

begin migration to native fetch()

Author: k8s-ci-robot

package-lock.json

@@ -85,7 +85,7 @@
         "husky": "^9.0.6",
         "mocha": "^11.0.1",
         "mock-fs": "^5.2.0",
-        "nock": "^13.2.9",
+        "nock": "^14.0.2",
         "prettier": "^3.0.0",
         "pretty-quick": "^4.0.0",
         "ts-mockito": "^2.3.1",

package.json

@@ -4,7 +4,6 @@ import yaml from 'js-yaml';
 import net from 'node:net';
 import path from 'node:path';
 
-import { Headers, RequestInit } from 'node-fetch';
 import { RequestContext } from './api.js';
 import { Authenticator } from './auth.js';
 import { AzureAuth } from './azure_auth.js';

src/config.ts

@@ -10,7 +10,6 @@ import { mock } from 'node:test';
 import mockfs from 'mock-fs';
 
 import { Authenticator } from './auth.js';
-import { Headers } from 'node-fetch';
 import { HttpMethod } from './index.js';
 import { assertRequestAgentsEqual, assertRequestOptionsEqual } from './test/match-buffer.js';
 import { CoreV1Api, RequestContext } from './api.js';
@@ -295,7 +294,7 @@ describe('KubeConfig', () => {
             strictEqual(headers.get('list'), 'a, b');
             strictEqual(headers.get('number'), '5');
             strictEqual(headers.get('string'), 'str');
-            assertRequestAgentsEqual(requestInit.agent as Agent, expectedAgent);
+            assertRequestAgentsEqual((requestInit as any).agent as Agent, expectedAgent);
         });
     });
 

src/config_test.ts

@@ -1,4 +1,3 @@
-import fetch from 'node-fetch';
 import { KubeConfig } from './config.js';
 import { RequestOptions } from 'node:https';
 

src/health.ts

@@ -18,6 +18,3 @@ export * from './health.js';
 export * from './middleware.js';
 export * from './patch.js';
 export { type ConfigOptions, type User, type Cluster, type Context } from './config_types.js';
-
-// Export FetchError so that instanceof checks in user code will definitely use the same instance
-export { FetchError } from 'node-fetch';

src/index.ts

@@ -1,5 +1,4 @@
-import fetch from 'node-fetch';
-import { Writable } from 'node:stream';
+import { Readable, Writable } from 'node:stream';
 import { ApiException } from './api.js';
 import { KubeConfig } from './config.js';
 import { V1Status } from './gen/index.js';
@@ -140,7 +139,7 @@ export class Log {
             const status = response.status;
             if (status === 200) {
                 // TODO: the follow search param still has the stream close prematurely based on my testing
-                response.body!.pipe(stream);
+                Readable.fromWeb(response.body!).pipe(stream);
             } else if (status === 500) {
                 const v1status = (await response.json()) as V1Status;
                 const v1code = v1status.code;

src/log.ts

@@ -1,4 +1,3 @@
-import fetch from 'node-fetch';
 import { KubeConfig } from './config.js';
 import { ApiException, V1Status } from './gen/index.js';
 import { normalizeResponseHeaders } from './util.js';

src/metrics.ts

@@ -148,7 +148,7 @@ describe('Metrics', () => {
             const metricsClient = new Metrics(kc);
             await rejects(metricsClient.getPodMetrics(), (err) => {
                 ok(err instanceof ApiException);
-                match(err.message, /connect ECONNREFUSED 127.0.0.1:51011/);
+                match(err.message, /Error occurred in metrics request: fetch failed/);
                 return true;
             });
         });

src/metrics_test.ts

@@ -1,4 +1,3 @@
-import { Response } from 'node-fetch';
 import { CoreV1Api, V1Container, V1Pod } from './gen/index.js';
 
 export async function podsForNode(api: CoreV1Api, nodeName: string): Promise<V1Pod[]> {