debug

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

Author: RomanNikitenko

code/extensions/che-github-authentication/src/error-handler.ts

@@ -13,7 +13,7 @@
 import {
   V1alpha2DevWorkspaceSpecTemplate
 } from '@devfile/api';
-import * as k8s from '@kubernetes/client-node';
+import type { V1Secret } from '@kubernetes/client-node';
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
 import * as vscode from 'vscode';
@@ -53,7 +53,7 @@ export class ErrorHandler {
   }
 
   // the token is present, but is expired
-  private async onTokenExpired(gitCredentialSecrets: Array<k8s.V1Secret>): Promise<void> {
+  private async onTokenExpired(gitCredentialSecrets: Array<V1Secret>): Promise<void> {
     const cheSecrets = filterCheSecrets(gitCredentialSecrets);
     if (cheSecrets.length > 0) {
       this.onCheControlledTokenExpired();

code/extensions/che-github-authentication/src/k8s-helper.ts

@@ -16,42 +16,58 @@ import {
   devworkspacePlural,
   V1alpha2DevWorkspace
 } from '@devfile/api';
-import * as k8s from '@kubernetes/client-node';
+import type { CoreV1Api, CustomObjectsApi, KubeConfig, V1Secret } from '@kubernetes/client-node';
 import { injectable } from 'inversify';
 
 const PART_OF_LABEL = 'app.kubernetes.io/part-of';
 const CHE_ECLIPSE_ORG_LABEL = 'che.eclipse.org';
 const CHE_ECLIPSE_ORG_DEVFILE_LABEL = 'che.eclipse.org/devfile';
 
+let k8sModulePromise: Promise<typeof import('@kubernetes/client-node')> | undefined;
+
+async function getK8sModule(): Promise<typeof import('@kubernetes/client-node')> {
+  if (!k8sModulePromise) {
+    k8sModulePromise = import('@kubernetes/client-node');
+  }
+  return k8sModulePromise;
+}
+
 @injectable()
 export class K8sHelper {
-  private coreV1API!: k8s.CoreV1Api;
-  private customObjectsApi!: k8s.CustomObjectsApi;
-  private k8sConfig: k8s.KubeConfig;
+  private coreV1API!: CoreV1Api;
+  private customObjectsApi!: CustomObjectsApi;
+  private k8sConfig!: KubeConfig;
   private devWorkspaceName!: string;
   private devWorkspaceNamespace!: string;
 
-
-  constructor() {
-    this.k8sConfig = new k8s.KubeConfig();
+  private async getK8sConfig(): Promise<KubeConfig> {
+    if (!this.k8sConfig) {
+      const k8s = await getK8sModule();
+      this.k8sConfig = new k8s.KubeConfig();
+    }
+    return this.k8sConfig;
   }
 
-  getConfig(): k8s.KubeConfig {
-    return this.k8sConfig;
+  async getConfig(): Promise<KubeConfig> {
+    return this.getK8sConfig();
   }
 
-  getCoreApi(): k8s.CoreV1Api {
+  async getCoreApi(): Promise<CoreV1Api> {
     if (!this.coreV1API) {
-      this.k8sConfig.loadFromDefault();
-      this.coreV1API = this.k8sConfig.makeApiClient(k8s.CoreV1Api);
+      const k8sConfig = await this.getK8sConfig();
+      const k8s = await getK8sModule();
+      k8sConfig.loadFromDefault();
+      this.coreV1API = k8sConfig.makeApiClient(k8s.CoreV1Api);
     }
     return this.coreV1API;
   }
 
-  getCustomObjectsApi(): k8s.CustomObjectsApi {
+  async getCustomObjectsApi(): Promise<CustomObjectsApi> {
     if (!this.customObjectsApi) {
-      this.k8sConfig.loadFromCluster();
-      this.customObjectsApi = this.k8sConfig.makeApiClient(k8s.CustomObjectsApi);
+      const k8sConfig = await this.getK8sConfig();
+      const k8s = await getK8sModule();
+      k8sConfig.loadFromCluster();
+      this.customObjectsApi = k8sConfig.makeApiClient(k8s.CustomObjectsApi);
     }
     return this.customObjectsApi;
   }
@@ -60,7 +76,7 @@ export class K8sHelper {
     try {
       const workspaceName = this.getDevWorkspaceName();
       const namespace = this.getDevWorkspaceNamespace();
-      const customObjectsApi = this.getCustomObjectsApi();
+      const customObjectsApi = await this.getCustomObjectsApi();
 
       const resp = await customObjectsApi.getNamespacedCustomObject({
         group: devworkspaceGroup,
@@ -76,8 +92,8 @@ export class K8sHelper {
     }
   }
 
-  async getSecret(labelSelector?: string): Promise<Array<k8s.V1Secret>> {
-    const coreV1API = this.getCoreApi();
+  async getSecret(labelSelector?: string): Promise<Array<V1Secret>> {
+    const coreV1API = await this.getCoreApi();
     const namespace = this.getDevWorkspaceNamespace();
     if (!namespace) {
       throw new Error('Can not get secrets: DEVWORKSPACE_NAMESPACE env variable is not defined');
@@ -126,8 +142,8 @@ export class K8sHelper {
   }
 }
 
-export function filterCheSecrets(secrets: k8s.V1Secret[]): k8s.V1Secret[] {
-  return secrets.filter((secret: k8s.V1Secret) => {
+export function filterCheSecrets(secrets: V1Secret[]): V1Secret[] {
+  return secrets.filter((secret: V1Secret) => {
     console.log('part of ', secret.metadata!.labels![PART_OF_LABEL]);
     if (secret.metadata!.labels![PART_OF_LABEL] === CHE_ECLIPSE_ORG_LABEL) {
       return true;