replace token in Metalk8sLocalVolumeProvider by getToken

Author: hervedombya

ui/src/services/k8s/Metalk8sLocalVolumeProvider.test.ts

@@ -12,7 +12,7 @@ jest.mock('../k8s/api', () => ({
 describe('Metalk8sLocalVolumeProvider', () => {
   let provider: Metalk8sLocalVolumeProvider;
   const mockUrl = 'mock-url';
-  const mockToken = 'mock-token';
+  const mockToken = jest.fn(() => Promise.resolve('mock-token'));
 
   const mockCustomObjectsApi = {
     listClusterCustomObject: jest.fn(),
@@ -39,8 +39,6 @@ describe('Metalk8sLocalVolumeProvider', () => {
     });
 
     provider = new Metalk8sLocalVolumeProvider(mockUrl, mockToken);
-    provider.k8sClient = mockCoreV1Api;
-    provider.volumeClient = mockVolumeClient;
   });
 
   describe('listLocalPersistentVolumes', () => {

ui/src/services/k8s/Metalk8sLocalVolumeProvider.ts

@@ -1,4 +1,4 @@
-import { CoreV1Api, V1PersistentVolume } from '@kubernetes/client-node';
+import { V1PersistentVolume } from '@kubernetes/client-node';
 import * as ApiK8s from './api';
 import {
   Metalk8sV1alpha1VolumeClient,
@@ -22,18 +22,24 @@ export type LocalPersistentVolume = V1PersistentVolume & {
 };
 
 export default class Metalk8sLocalVolumeProvider {
-  volumeClient: Metalk8sV1alpha1VolumeClient;
-  k8sClient: CoreV1Api;
-  constructor(url: string, token: string) {
-    const { coreV1, customObjects } = ApiK8s.updateApiServerConfig(url, token);
-    this.volumeClient = new Metalk8sV1alpha1VolumeClient(customObjects);
-    this.k8sClient = coreV1;
+  apiUrl: string;
+  constructor(apiUrl: string, private getToken: () => Promise<string>) {
+    this.apiUrl = apiUrl;
   }
+
   public listLocalPersistentVolumes = async (
     serverName: string,
   ): Promise<LocalPersistentVolume[]> => {
     try {
-      const nodes = await this.k8sClient.listNode();
+      const token = await this.getToken();
+      const { coreV1, customObjects } = ApiK8s.updateApiServerConfig(
+        this.apiUrl,
+        token,
+      );
+      const volumeClient = new Metalk8sV1alpha1VolumeClient(customObjects);
+      const k8sClient = coreV1;
+
+      const nodes = await k8sClient.listNode();
       const nodeIP = nodes.body.items
         .find((node) => node.metadata.name === serverName)
         ?.status.addresses.find((address) => address.type === 'InternalIP');
@@ -42,13 +48,13 @@ export default class Metalk8sLocalVolumeProvider {
         throw new Error(`Failed to find IP for node ${serverName}`);
       }
 
-      const volumes = await this.volumeClient.getMetalk8sV1alpha1VolumeList();
+      const volumes = await volumeClient.getMetalk8sV1alpha1VolumeList();
 
       if (!isError(volumes)) {
         const nodeVolumes = volumes.body.items.filter(
           (volume) => volume.spec.nodeName === serverName,
         );
-        const pv = await this.k8sClient.listPersistentVolume();
+        const pv = await k8sClient.listPersistentVolume();
 
         const localPv = nodeVolumes.reduce((acc, item) => {
           const isLocalPv = pv.body.items.find(