Merge pull request #320 from kthcloud/main

Finish resource migration, minor improvements, bug fixes

Author: pierrelefevre

README.md

@@ -21,7 +21,6 @@ console uses these services for its functionality.
 kthcloud maintained:
 
 -   [go-deploy](https://github.com/kthcloud/go-deploy): Backend for creation, and management of resources
--   [sys-api](https://github.com/kthcloud/sys-api): Provides stats and capacities
 -   [alert](https://alert.app.cloud.cbh.kth.se/): Provides alerts
 -   [llama](https://llama.app.cloud.cbh.kth.se/): Enables genAI features
 -   [llama-prefetch](https://github.com/kthcloud/llama-prefetch/): Reduces genAI features latency by prefetching queries
@@ -31,7 +30,6 @@ External:
 
 -   [Gravatar](https://gravatar.com): Provides user avatars
 -   [Google Fonts](https://fonts.google.com): Provides fonts
--   [GitHub SSO](https://github.com): Enables linking GitHub repos for continuous delivery
 
 ## Setup
 

bun.lockb

@@ -15,14 +15,14 @@
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
     "@iconify/react": "^4.1.1",
-    "@kthcloud/go-deploy-types": "^1.0.17",
-    "@mui/icons-material": "^5.15.19",
+    "@kthcloud/go-deploy-types": "^1.0.20",
+    "@mui/icons-material": "^5.15.20",
     "@mui/lab": "^5.0.0-alpha.170",
-    "@mui/material": "^5.15.19",
+    "@mui/material": "^5.15.20",
     "@mui/material-next": "^6.0.0-alpha.126",
-    "@mui/x-tree-view": "^7.6.1",
+    "@mui/x-tree-view": "^7.7.0",
     "@react-keycloak/web": "^3.4.0",
-    "@react-three/fiber": "^8.16.7",
+    "@react-three/fiber": "^8.16.8",
     "@sanity/eventsource": "^5.0.2",
     "@types/crypto-js": "^4.2.2",
     "@types/numeral": "^2.0.5",
@@ -49,28 +49,28 @@
     "react-helmet-async": "^2.0.5",
     "react-i18next": "^14.1.2",
     "react-router-dom": "^6.23.1",
-    "simplebar": "^6.2.6",
-    "simplebar-react": "^3.2.5",
+    "simplebar": "^6.2.7",
+    "simplebar-react": "^3.2.6",
     "three": "^0.164.1",
     "three-stdlib": "^2.30.3",
-    "yaml": "^2.4.3"
+    "yaml": "^2.4.5"
   },
   "devDependencies": {
     "@faker-js/faker": "^8.4.1",
     "@types/react": "^18.3.3",
     "@types/react-copy-to-clipboard": "^5.0.7",
     "@types/react-dom": "^18.3.0",
-    "@typescript-eslint/eslint-plugin": "^7.12.0",
-    "@typescript-eslint/parser": "^7.12.0",
-    "@vitejs/plugin-react": "^4.3.0",
+    "@typescript-eslint/eslint-plugin": "^7.13.0",
+    "@typescript-eslint/parser": "^7.13.0",
+    "@vitejs/plugin-react": "^4.3.1",
     "@vitejs/plugin-react-swc": "^3.7.0",
     "eslint": "^9.4.0",
     "eslint-plugin-react": "^7.34.2",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-react-refresh": "^0.4.7",
-    "prettier": "^3.3.0",
+    "prettier": "^3.3.2",
     "prettier-plugin-nginx": "^1.0.3",
     "typescript": "^5.4.5",
-    "vite": "^5.2.12"
+    "vite": "^5.3.0"
   }
 }

package.json

@@ -167,24 +167,3 @@ export const applyCommand = async (id: string, command: any, token: string) => {
   }
   return true;
 };
-
-export const acceptDeploymentTransfer = async (
-  token: any,
-  id: any,
-  code: any
-) => {
-  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/deployments/${id}`;
-  const body = { transferCode: code };
-
-  const response = await fetch(url, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${token}`,
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify(body),
-  });
-
-  const result = await response.json();
-  return result;
-};

src/api/deploy/deployments.ts

@@ -1,4 +1,7 @@
-import { ResourceMigrationCreate } from "@kthcloud/go-deploy-types/types/v2/body";
+import {
+  ResourceMigrationCreate,
+  ResourceMigrationUpdate,
+} from "@kthcloud/go-deploy-types/types/v2/body";
 import { Jwt } from "../../types";
 
 export const createResourceMigration = async (
@@ -20,3 +23,68 @@ export const createResourceMigration = async (
   }
   return result;
 };
+
+export const getMigration = async (token: Jwt, id: string) => {
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/resourceMigrations/${id}`;
+  const response = await fetch(url, {
+    headers: {
+      Authorization: `Bearer ${token}`,
+    },
+  });
+  const result = await response.json();
+  if (!response.ok) {
+    throw result;
+  }
+  return result;
+};
+
+export const listMigrations = async (token: Jwt) => {
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/resourceMigrations`;
+  const response = await fetch(url, {
+    headers: {
+      Authorization: `Bearer ${token}`,
+    },
+  });
+  const result = await response.json();
+  if (!response.ok) {
+    throw result;
+  }
+  return result;
+};
+
+export const deleteMigration = async (token: Jwt, id: string) => {
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/resourceMigrations/${id}`;
+  const response = await fetch(url, {
+    method: "DELETE",
+    headers: {
+      Authorization: `Bearer ${token}`,
+    },
+  });
+  const result = await response.json();
+  if (!response.ok) {
+    throw result;
+  }
+  return result;
+};
+
+export const acceptMigration = async (token: Jwt, id: string, code: string) => {
+  const body: ResourceMigrationUpdate = {
+    status: "accepted",
+    code: code,
+  };
+
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/resourceMigrations/${id}`;
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`,
+    },
+    body: JSON.stringify(body),
+  });
+  const result = await response.json();
+  if (!response.ok) {
+    throw result;
+  }
+  return result;
+};

src/api/deploy/resourceMigrations.ts

@@ -1,6 +1,7 @@
 import {
   ApiKeyCreated,
   UserRead,
+  UserReadDiscovery,
   UserUpdate,
 } from "@kthcloud/go-deploy-types/types/v2/body";
 import { Jwt, Uuid } from "../../types";
@@ -128,3 +129,27 @@ export const createApiKey = async (
   }
   return await res.json();
 };
+
+export const discoverUserById = async (
+  userId: string,
+  token: string
+): Promise<UserReadDiscovery> => {
+  const res = await fetch(
+    import.meta.env.VITE_DEPLOY_API_URL + "/users/" + userId + "?discover=true",
+    {
+      method: "GET",
+      headers: {
+        Authorization: "Bearer " + token,
+      },
+    }
+  );
+
+  if (!res.ok) {
+    const body = await res.json();
+    if (body) {
+      throw body;
+    }
+    throw res;
+  }
+  return await res.json();
+};

src/api/deploy/users.ts

@@ -16,6 +16,7 @@ import { getVMById, listVMs } from "../api/deploy/vms";
 
 import {
   NotificationRead as Notification,
+  ResourceMigrationRead,
   TeamRead as Team,
   ZoneRead as Zone,
 } from "@kthcloud/go-deploy-types/types/v2/body/index";
@@ -26,6 +27,7 @@ import {
 } from "@kthcloud/go-deploy-types/types/v2/body";
 import { listGpuGroups } from "../api/deploy/gpuGroups";
 import { listGpuLeases } from "../api/deploy/gpuLeases";
+import { listMigrations } from "../api/deploy/resourceMigrations";
 
 type ResourceContextType = {
   rows: Resource[];
@@ -50,6 +52,8 @@ type ResourceContextType = {
   setGpuGroups: (gpuGroups: GpuGroupRead[]) => void;
   gpuLeases: GpuLeaseRead[];
   setGpuLeases: (gpuLeases: GpuLeaseRead[]) => void;
+  resourceMigrations: ResourceMigrationRead[];
+  setResourceMigrations: (resourceMigrations: ResourceMigrationRead[]) => void;
   queueJob: (job: Job) => void;
   beginFastLoad: () => void;
   initialLoad: boolean;
@@ -83,6 +87,8 @@ const initialState: ResourceContextType = {
   setGpuGroups: () => {},
   gpuLeases: new Array<GpuLeaseRead>(),
   setGpuLeases: () => {},
+  resourceMigrations: new Array<ResourceMigrationRead>(),
+  setResourceMigrations: () => {},
   queueJob: () => {},
   initialLoad: false,
   setInitialLoad: () => {},
@@ -118,6 +124,9 @@ export const ResourceContextProvider = ({
   const [zones, setZones] = useState<Zone[]>([]);
   const [gpuGroups, setGpuGroups] = useState<GpuGroupRead[]>([]);
   const [gpuLeases, setGpuLeases] = useState<GpuLeaseRead[]>([]);
+  const [resourceMigrations, setResourceMigrations] = useState<
+    ResourceMigrationRead[]
+  >([]);
 
   // Loading and connection error handler
   const [initialLoad, setInitialLoad] = useState<boolean>(false);
@@ -244,6 +253,20 @@ export const ResourceContextProvider = ({
     }
   };
 
+  const loadResourceMigrations = async () => {
+    if (!(initialized && keycloak.authenticated && keycloak.token)) return;
+    try {
+      const migrations = await listMigrations(keycloak.token);
+      setResourceMigrations(migrations);
+    } catch (error: any) {
+      errorHandler(error).forEach((e) =>
+        enqueueSnackbar("Error fetching migrations: " + e, {
+          variant: "error",
+        })
+      );
+    }
+  };
+
   const loadNotifications = async () => {
     if (!(initialized && keycloak.authenticated && keycloak.token)) return;
     try {
@@ -368,6 +391,7 @@ export const ResourceContextProvider = ({
     loadZones();
     loadGpuGroups();
     loadGpuLeases();
+    loadResourceMigrations();
 
     // eslint-disable-next-line
   }, [user]);
@@ -416,6 +440,8 @@ export const ResourceContextProvider = ({
         setGpuGroups,
         gpuLeases,
         setGpuLeases,
+        resourceMigrations,
+        setResourceMigrations,
         queueJob,
         beginFastLoad,
         initialLoad,

src/api/sys/index.ts

@@ -25,9 +25,9 @@
         "error-creating-vm": "Error creating VM",
         "error-all-fields": "Please fill all fields",
         "resource-deployments": "Deployments",
-        "resource-kubernetes-deployment": "Kubernetes deployment",
-        "resource-vms": "Virtual machines",
-        "resource-vm": "Virtual machine",
+        "deployment": "Deployment",
+        "vms": "Virtual machines",
+        "vm": "Virtual machine",
         "resource-gpus": "GPUs",
         "resource-gpu": "GPU",
         "resource-users": "Users",
@@ -531,6 +531,9 @@
         "not-permitted-to-gpu-page": "Cannot access GPU page: Not allowed to use GPUs",
         "nothing-to-do": "Nothing to do",
         "image-tag": "Image tag",
-        "too-many-run-args": "Too many run args, max 100"
+        "too-many-run-args": "Too many run args, max 100",
+        "pending-migrations": "Pending migrations",
+        "migration": "Migration",
+        "of": "of"
     }
 }

src/contexts/ResourceContext.tsx

@@ -20,7 +20,7 @@
         "menu-label": "Meny",
         "create-deployment-app-path-label": "Filsökväg i appen",
         "create-deployment-github-title": "Koppla GitHub projekt",
-        "resource-vm": "Virtuell maskin",
+        "vm": "Virtuell maskin",
         "login-with-github": "Logga in med GitHub",
         "admin-name-call-to-action": "Proxy kommer att ha namnet: ",
         "gpu-drivers-3": " för att installera senaste drivrutinerna.",
@@ -263,7 +263,7 @@
         "admin-leased-until": "Lånat till",
         "specs-subheader": "Ändra storlek utifrån dina behov",
         "onboarding-deployments": "Resurstyp: Deployments",
-        "resource-kubernetes-deployment": "Kubernetes deployment",
+        "deployment": "Deployment",
         "tcp-first": "Exponera en TCP port först",
         "gpu-lease": "Låna grafikkort",
         "admin-user": "Användare",
@@ -288,7 +288,7 @@
         "take-me-back": "Ta mig hem",
         "admin-status": "Status",
         "revert": "Återgå",
-        "resource-vms": "Virtuella maskiner",
+        "vms": "Virtuella maskiner",
         "create-deployment-env-key": "Variabel",
         "error-all-fields": "Fyll i alla fält",
         "create-vm-minimum-disk-size": "Minst diskutrymme",
@@ -530,6 +530,9 @@
         "run-args": "Argument till körning",
         "nothing-to-do": "Inget att göra",
         "image-tag": "Image tagg",
-        "too-many-run-args": "För många argument, max 100"
+        "too-many-run-args": "För många argument, max 100",
+        "pending-migrations": "Pågående överföringar",
+        "migration": "Överföring",
+        "of": "av"
     }
 }