debug

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

Author: RomanNikitenko

code/extensions/che-api/src/impl/github-service-impl.ts

@@ -10,7 +10,7 @@
 
 /* eslint-disable header/header */
 
-import * as k8s from '@kubernetes/client-node';
+import type { V1Secret } from '@kubernetes/client-node';
 import * as fs from 'fs-extra';
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
@@ -35,12 +35,23 @@ const GIT_CREDENTIALS_LABEL_SELECTOR: string = createLabelsSelector(GIT_CREDENTI
 @injectable()
 export class GithubServiceImpl implements GithubService {
   private token: string | undefined;
+  private tokenInitializationPromise: Promise<void> | undefined;
 
   constructor(
     @inject(Logger) private logger: Logger,
     @inject(K8SServiceImpl) private readonly k8sService: K8SServiceImpl
-  ) {
-    this.initializeToken();
+  ) {}
+
+  private async ensureTokenInitialized(): Promise<void> {
+    if (this.token !== undefined) {
+      return;
+    }
+    if (!this.tokenInitializationPromise) {
+      this.tokenInitializationPromise = this.initializeToken().finally(() => {
+        this.tokenInitializationPromise = undefined;
+      });
+    }
+    await this.tokenInitializationPromise;
   }
 
   private checkToken(): void {
@@ -50,17 +61,20 @@ export class GithubServiceImpl implements GithubService {
   }
 
   async getToken(): Promise<string> {
+    await this.ensureTokenInitialized();
     this.checkToken();
     return this.token!;
   }
 
   async getUser(): Promise<GithubUser> {
+    await this.ensureTokenInitialized();
     this.checkToken();
     const result = await this.fetchGithubUser(this.token!);
     return result.user;
   }
 
   async getTokenScopes(token: string): Promise<string[]> {
+    await this.ensureTokenInitialized();
     this.checkToken();
     const result = await this.fetchGithubUser(token);
     return result.scopes;
@@ -128,7 +142,8 @@ export class GithubServiceImpl implements GithubService {
     }
 
     // another token should be used by the Github Service after removing the Device Authentication token
-    this.initializeToken();
+    this.token = undefined;
+    await this.ensureTokenInitialized();
   }
 
   private async initializeToken(): Promise<void> {
@@ -203,7 +218,7 @@ export class GithubServiceImpl implements GithubService {
   }
 }
 
-function toDeviceAuthSecret(token: string, namespace: string): k8s.V1Secret {
+function toDeviceAuthSecret(token: string, namespace: string): V1Secret {
   return {
     apiVersion: 'v1',
     kind: 'Secret',

code/extensions/che-api/src/impl/k8s-devfile-service-impl.ts

@@ -12,7 +12,7 @@
 
 import * as fs from 'fs-extra';
 import * as jsYaml from 'js-yaml';
-import * as k8s from '@kubernetes/client-node';
+import type { V1Pod } from '@kubernetes/client-node';
 
 import {
   V1alpha2DevWorkspaceSpecTemplate
@@ -23,7 +23,6 @@ import { inject, injectable } from 'inversify';
 import { K8SServiceImpl } from './k8s-service-impl';
 import { DevfileService } from '../api/devfile-service';
 import { K8sDevWorkspaceEnvVariables } from './k8s-devworkspace-env-variables';
-import { V1Pod } from '@kubernetes/client-node';
 
 @injectable()
 export class K8sDevfileServiceImpl implements DevfileService {
@@ -47,6 +46,7 @@ export class K8sDevfileServiceImpl implements DevfileService {
   }
 
   async getWorkspacePod(): Promise<V1Pod> {
+    const k8s = await import('@kubernetes/client-node');
     // get workspace pod
     const k8sCoreV1Api = this.k8SService.makeApiClient(k8s.CoreV1Api);
     const labelSelector = `controller.devfile.io/devworkspace_id=${this.env.getWorkspaceId()}`;
@@ -67,6 +67,7 @@ export class K8sDevfileServiceImpl implements DevfileService {
 
 
   async updateDevfile(devfile: V1alpha2DevWorkspaceSpecTemplate): Promise<void> {
+    const k8s = await import('@kubernetes/client-node');
     // Grab custom resource object
     const customObjectsApi = this.k8SService.makeApiClient(k8s.CustomObjectsApi);
     const group = 'workspace.devfile.io';

code/extensions/che-commands/src/editorConfigs/editor-configurations.ts

@@ -10,7 +10,7 @@
 
 /* eslint-disable header/header */
 
-import * as k8s from '@kubernetes/client-node';
+import type { V1ConfigMap } from '@kubernetes/client-node';
 import * as vscode from 'vscode';
 import { InstallFromVSIX } from './install-from-vsix';
 
@@ -65,8 +65,9 @@ export class EditorConfigurations {
         }
     }
 
-    private async getConfigmap(): Promise<k8s.V1ConfigMap | undefined> {
+    private async getConfigmap(): Promise<V1ConfigMap | undefined> {
         try {
+            const k8s = await import('@kubernetes/client-node');
             const k8sConfig = new k8s.KubeConfig();
             k8sConfig.loadFromCluster();
             const coreV1API = k8sConfig.makeApiClient(k8s.CoreV1Api);

code/extensions/che-resource-monitor/src/k8s-helper.ts

@@ -10,7 +10,7 @@
 
 /* eslint-disable header/header */
 
-import * as k8s from '@kubernetes/client-node';
+import type { CoreV1Api, KubeConfig } from '@kubernetes/client-node';
 import { injectable } from 'inversify';
 import { Agent as HttpsAgent } from 'https';
 import fetch, { RequestInit } from 'node-fetch';
@@ -21,28 +21,45 @@ export interface K8SRawResponse {
   error: string;
 }
 
+type K8sModule = typeof import('@kubernetes/client-node');
+let k8sModule: K8sModule | undefined;
+
+function getK8sModule(): K8sModule {
+  if (!k8sModule) {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    k8sModule = require('@kubernetes/client-node') as K8sModule;
+  }
+  return k8sModule;
+}
+
 @injectable()
 export class K8sHelper {
-  private k8sAPI!: k8s.CoreV1Api;
-  private kc!: k8s.KubeConfig;
+  private k8sAPI!: CoreV1Api;
+  private kc!: KubeConfig;
 
-  initConfig(): k8s.KubeConfig {
-    return new k8s.KubeConfig();
+  private getConfig(): KubeConfig {
+    if (!this.kc) {
+      const k8s = getK8sModule();
+      this.kc = new k8s.KubeConfig();
+      this.kc.loadFromDefault();
+    }
+    return this.kc;
   }
 
-  getCoreApi(): k8s.CoreV1Api {
+  getCoreApi(): CoreV1Api {
     if (!this.k8sAPI) {
-      this.kc = this.initConfig();
-      this.kc.loadFromDefault();
-      this.k8sAPI = this.kc.makeApiClient(k8s.CoreV1Api);
+      const config = this.getConfig();
+      const k8s = getK8sModule();
+      this.k8sAPI = config.makeApiClient(k8s.CoreV1Api);
     }
     return this.k8sAPI;
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   sendRawQuery(requestURL: string, opts: any): Promise<K8SRawResponse> {
-    this.kc.applyToFetchOptions(opts);
-    const cluster = this.kc.getCurrentCluster();
+    const config = this.getConfig();
+    config.applyToFetchOptions(opts);
+    const cluster = config.getCurrentCluster();
     if (!cluster) {
       throw new Error('K8S cluster is not defined');
     }