fix: remove unused request dependency

Author: rbnayax

FETCH_MIGRATION.md

@@ -51,12 +51,12 @@ Code will be on the `master` branch.
 -   [x] Match src/gen/api.ts to new generated layout (it changes slightly)
 -   [ ] Fix errors in /src folder (due to new api)
     -   [x] migrate src/auth.ts, the dependent implementations (ex: azure_auth, gcp_auth etc) and tests to fetch api from request
-    -   [ ] migrate src/log.ts and its tests to fetch api from request
-        -   major remaining work is fixing up async signatures and return piping
-    -   [ ] migrate src/watch.ts and its tests to fetch api from request
-        -   remove decprecated requestImpl and RequestInterface
-        -   implement queryParams parameter in watch method by injecting them into the fetch call
-        -   update tests in src/watch_test.ts
+    -   [x] migrate src/log.ts and its tests to fetch api from request
+        -  [x] major remaining work is fixing up async signatures and return piping
+    -   [x] migrate src/watch.ts and its tests to fetch api from request
+        -  [x] remove decprecated requestImpl and RequestInterface
+        -  [x] implement queryParams parameter in watch method by injecting them into the fetch call
+        -  [ ] update tests in src/watch_test.ts
 -   [ ] Fix errors in test (due to new api)
 -   [ ] Test all features
 -   [ ] Fix examples and validate their param signatures (due to new api)

package-lock.json

@@ -56,13 +56,15 @@
     "dependencies": {
         "@types/js-yaml": "^4.0.1",
         "@types/node": "^10.12.0",
+        "@types/node-fetch": "^2.6.3",
         "@types/stream-buffers": "^3.0.3",
         "@types/tar": "^6.1.1",
         "@types/underscore": "^1.8.9",
         "@types/ws": "^6.0.1",
         "abort-controller": "^3.0.0",
         "byline": "^5.0.0",
         "execa": "5.0.0",
+        "form-data": "^4.0.0",
         "isomorphic-ws": "^4.0.1",
         "js-yaml": "^4.1.0",
         "jsonpath-plus": "^0.19.0",

package.json

@@ -1,3 +1,4 @@
+import AbortController from 'abort-controller';
 import {
     ADD,
     CHANGE,
@@ -12,7 +13,7 @@ import {
 } from './informer';
 import { KubernetesObject } from './types';
 import { ObjectSerializer } from './util';
-import { RequestResult, Watch } from './watch';
+import { Watch } from './watch';
 
 export interface ObjectCache<T> {
     get(name: string, namespace?: string): T | undefined;
@@ -25,7 +26,7 @@ export class ListWatch<T extends KubernetesObject> implements ObjectCache<T>, In
     private resourceVersion: string;
     private readonly indexCache: { [key: string]: T[] } = {};
     private readonly callbackCache: { [key: string]: Array<ObjectCallback<T> | ErrorCallback> } = {};
-    private request: RequestResult | undefined;
+    private request: AbortController | undefined;
     private stopped: boolean = false;
 
     public constructor(

src/cache.ts

@@ -7,6 +7,7 @@ import path = require('path');
 
 import shelljs = require('shelljs');
 
+import { Headers, RequestInit } from 'node-fetch';
 import * as api from './api';
 import { Authenticator } from './auth';
 import { AzureAuth } from './azure_auth';
@@ -146,6 +147,26 @@ export class KubeConfig implements SecurityAuthentication {
         this.makePathsAbsolute(rootDirectory);
     }
 
+    public async applytoFetchOptions(opts: https.RequestOptions): Promise<RequestInit> {
+        await this.applytoHTTPSOptions(opts);
+        const headers = new Headers();
+        for (const [key, val] of Object.entries(opts.headers || {})) {
+            if (Array.isArray(val)) {
+                val.forEach((innerVal) => {
+                    headers.append(key, innerVal);
+                });
+            } else if (typeof val === 'number' || typeof val === 'string') {
+                headers.set(key, val.toString());
+            }
+        }
+        return {
+            agent: opts.agent,
+            headers,
+            method: opts.method,
+            timeout: opts.timeout,
+        };
+    }
+
     public async applytoHTTPSOptions(opts: https.RequestOptions): Promise<void> {
         const user = this.getCurrentUser();
 

src/config.ts

@@ -8,7 +8,7 @@
  *
  */
 export class ApiException<T> extends Error {
-    public constructor(public code: number, message: string, public body: T, public headers: { [key: string]: string; }) {
+    public constructor(public code: number, message: string, public body: T, public headers: { [key: string]: string | string[]; }) {
         super("HTTP-Code: " + code + "\nMessage: " + message + "\nBody: " + JSON.stringify(body) + "\nHeaders: " +
         JSON.stringify(headers))
     }