Move getRequestOptions to JsonApi.

Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>

src/common/k8s-api/json-api.ts

@@ -52,6 +52,7 @@ export interface JsonApiConfig {
   apiBase: string;
   serverAddress: string;
   debug?: boolean;
+  getRequestOptions?: () => RequestInit;
 }
 export class JsonApi<D = JsonApiData, P extends JsonApiParams = JsonApiParams> {
   static reqInitDefault: RequestInit = {
@@ -68,18 +69,21 @@ export class JsonApi<D = JsonApiData, P extends JsonApiParams = JsonApiParams> {
     this.config = Object.assign({}, JsonApi.configDefault, config);
     this.reqInit = merge({}, JsonApi.reqInitDefault, reqInit);
     this.parseResponse = this.parseResponse.bind(this);
+    this.getRequestOptions = config.getRequestOptions;
   }
 
   public onData = new EventEmitter<[D, Response]>();
   public onError = new EventEmitter<[JsonApiErrorParsed, Response]>();
   
+  private getRequestOptions?: () => RequestInit;
+
   get<T = D>(path: string, params?: P, reqInit: RequestInit = {}) {
     return this.request<T>(path, params, { ...reqInit, method: "get" });
   }
 
   getResponse(path: string, params?: P, init: RequestInit = {}): Promise<Response> {
     let reqUrl = `${this.config.serverAddress}${this.config.apiBase}${path}`;
-    const reqInit: RequestInit = merge({}, this.reqInit, init);
+    const reqInit: RequestInit = merge({}, this.reqInit, this.getRequestOptions?.(), init);
     const { query } = params || {} as P;
 
     if (!reqInit.method) {
@@ -113,7 +117,7 @@ export class JsonApi<D = JsonApiData, P extends JsonApiParams = JsonApiParams> {
 
   protected async request<D>(path: string, params?: P, init: RequestInit = {}) {
     let reqUrl = `${this.config.serverAddress}${this.config.apiBase}${path}`;
-    const reqInit: RequestInit = merge({}, this.reqInit, init);
+    const reqInit: RequestInit = merge({}, this.reqInit, this.getRequestOptions?.(), init);
     const { data, query } = params || {} as P;
 
     if (data && !reqInit.body) {

src/common/k8s-api/kube-api.ts

@@ -109,6 +109,7 @@ export interface IRemoteKubeApiConfig {
   }
   user: {
     token?: string;
+    getToken?: () => string;
     clientCertificateData?: string;
     clientKeyData?: string;
   }
@@ -135,9 +136,13 @@ export function forCluster<T extends KubeObject>(cluster: ILocalKubeApiConfig, k
 export function forRemoteCluster<T extends KubeObject>(config: IRemoteKubeApiConfig, kubeClass: KubeObjectConstructor<T>): KubeApi<T> {
   const reqInit: RequestInit = {};
 
-  if (config.user.token) {
+  if (config.user.token && config.user.getToken) {
+    throw new Error("Provide either user.token or user.getToken");
+  }
+
+  if (config.user.token || config.user.getToken) {
     reqInit.headers = {
-      "Authorization": `Bearer ${config.user.token}`
+      "Authorization": `Bearer ${config.user.token ?? config.user.getToken()}`
     };
   }
 
@@ -167,6 +172,13 @@ export function forRemoteCluster<T extends KubeObject>(config: IRemoteKubeApiCon
     serverAddress: config.cluster.server,
     apiBase: "",
     debug: isDevelopment,
+    ...(config.user.getToken ? {
+      getRequestOptions: () => ({
+        headers: {
+          "Authorization": `Bearer ${config.user.getToken()}`
+        }
+      })
+    } : {})
   }, reqInit);
 
   return new KubeApi({
@@ -195,9 +207,6 @@ export type KubeApiWatchOptions = {
   abortController?: AbortController
   watchId?: string;
   retry?: boolean;
-
-  // Request options that are applied for the initial watch request and also subsequent retry requests
-  getRequestOptions?: () => RequestInit;
 };
 
 export class KubeApi<T extends KubeObject> {
@@ -489,12 +498,7 @@ export class KubeApi<T extends KubeObject> {
   watch(opts: KubeApiWatchOptions = { namespace: "", retry: false }): () => void {
     let errorReceived = false;
     let timedRetry: NodeJS.Timeout;
-    const {
+    const { abortController: { abort, signal } = new AbortController(), namespace, callback = noop, retry } = opts;
-      abortController: { abort, signal } = new AbortController(),
-      namespace,
-      callback = noop,
-      retry,
-      getRequestOptions } = opts;
     const { watchId = `${this.kind.toLowerCase()}-${this.watchId++}` } = opts;
 
     signal.addEventListener("abort", () => {
@@ -503,11 +507,7 @@ export class KubeApi<T extends KubeObject> {
     });
 
     const watchUrl = this.getWatchUrl(namespace);
-    const responsePromise = this.request.getResponse(
+    const responsePromise = this.request.getResponse(watchUrl, null,{ signal, timeout: 600_000 });
-      watchUrl,
-      null,
-      merge({ signal, timeout: 600_000 }, getRequestOptions?.())
-    );
 
     logger.info(`[KUBE-API] watch (${watchId}) ${retry === true ? "retried" : "started"} ${watchUrl}`);